fix

sculkmp · Dec 9, 2024 · 5666fa7 · 5666fa7
1 parent 1a50149
commit 5666fa7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/main/java/org/sculk/network/handler/InGamePacketHandler.java b/src/main/java/org/sculk/network/handler/InGamePacketHandler.java
@@ -4,10 +4,14 @@
 import lombok.NonNull;
 import org.cloudburstmc.protocol.bedrock.packet.CommandRequestPacket;
 import org.cloudburstmc.protocol.bedrock.packet.EmotePacket;
+import org.cloudburstmc.protocol.bedrock.packet.PlayerSkinPacket;
 import org.cloudburstmc.protocol.bedrock.packet.TextPacket;
 import org.cloudburstmc.protocol.common.PacketSignal;
 import org.sculk.player.Player;
 import org.sculk.network.session.SculkServerSession;
+import org.sculk.utils.SkinUtils;
+
+import java.util.Objects;
 
 /*
  *   ____             _ _
@@ -35,15 +39,13 @@ public InGamePacketHandler(Player player, SculkServerSession session) {
 
     @Override
     public PacketSignal handle(TextPacket packet) {
-        switch(packet.getType()) {
-            case TextPacket.Type.CHAT -> {
-                String chatMessage = packet.getMessage();
-                int breakLine = chatMessage.indexOf("\n");
-                if(breakLine != -1) {
-                    chatMessage = chatMessage.substring(0, breakLine);
-                }
-                this.player.onChat(chatMessage);
+        if (Objects.requireNonNull(packet.getType()) == TextPacket.Type.CHAT) {
+            String chatMessage = packet.getMessage();
+            int breakLine = chatMessage.indexOf("\n");
+            if (breakLine != -1) {
+                chatMessage = chatMessage.substring(0, breakLine);
             }
+            this.player.onChat(chatMessage);
         }
         return PacketSignal.HANDLED;
     }
@@ -55,4 +57,11 @@ public PacketSignal handle(CommandRequestPacket packet) {
         }
         return PacketSignal.HANDLED;
     }
+
+
+    @Override
+    public PacketSignal handle(PlayerSkinPacket packet) {
+        this.player.changeSkin(SkinUtils.fromSerialized(packet.getSkin()), "", "");
+        return PacketSignal.HANDLED;
+    }
 }
diff --git a/src/main/java/org/sculk/network/handler/LoginPacketHandler.java b/src/main/java/org/sculk/network/handler/LoginPacketHandler.java
@@ -48,7 +48,7 @@ public LoginPacketHandler(SculkServerSession session, Consumer<ClientChainData>
     @Override
     public PacketSignal handle(LoginPacket packet) {
         ClientChainData clientChainData = ClientChainData.read(packet);
-        if(clientChainData.isXboxAuthed()) {
+        if(!clientChainData.isXboxAuthed()) {
             session.disconnect("disconnectionScreen.notAuthenticated");
             return PacketSignal.HANDLED;
         }