924dc67

src/net/bowmap/transport/connection.clj modified (view file)

@@ -16,17 +16,21 @@ (defn handle-serverbound-frame!   [state conn frame]   (let [{::phase/keys! [phase]} @state-        {::pk/keys! [id] :as packet} (decode-packet! frame phase)]-    (case id-      ::serverbound/handshaking        (swap! state assoc ::phase/phase (req! packet ::phase/phase))-      ::serverbound/login-acknowledged (swap! state assoc ::phase/phase ::phase/config)-      ::serverbound/finish-config      (swap! state assoc ::phase/phase ::phase/play)-      ::serverbound/login-start-      (let [{:keys! [username uuid]} packet]-        (swap! state assoc ::player/username username ::player/uuid uuid))-      nil)-    ; Just kinda crudely passing the connection into the serverbound packet right now-    (merge packet {::connection conn} (select-keys @state [::player/uuid]))))+        packet (try (decode-packet! frame phase)+                    (catch Exception e+                      (Throwable/.printStackTrace (Exception. "Failed to decode packet!" e))+                      nil))]+    (when-let [{::pk/keys! [id]} packet]+      (case id+        ::serverbound/handshaking        (swap! state assoc ::phase/phase (req! packet ::phase/phase))+        ::serverbound/login-acknowledged (swap! state assoc ::phase/phase ::phase/config)+        ::serverbound/finish-config      (swap! state assoc ::phase/phase ::phase/play)+        ::serverbound/login-start+        (let [{:keys! [username uuid]} packet]+          (swap! state assoc ::player/username username ::player/uuid uuid))+        nil)+      ; Just kinda crudely passing the connection into the serverbound packet right now+      (merge packet {::connection conn} (select-keys @state [::player/uuid])))))  (defn connection   "Creates a connection object from a java.net.Socket@@ -61,7 +65,8 @@     (io-thread       (try         (loop []-          (put! serverbound-packets (handle-serverbound-frame! state conn (streams/read-frame!! input-stream)))+          (when-let [packet (handle-serverbound-frame! state conn (streams/read-frame!! input-stream))]+            (put! serverbound-packets packet))           (recur))         (catch EOFException _)         (catch SocketException _)