diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java
index 254d9974a..c5798b480 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java
@@ -84,6 +84,7 @@ public final class Protocol1_20_2To1_20 extends AbstractProtocol<ClientboundPack
 
             final ConfigurationState configurationState = wrapper.user().get(ConfigurationState.class);
             configurationState.setBridgePhase(ConfigurationState.BridgePhase.CONFIGURATION);
+            // TODO: ... WE NEED TO SET THE ACTUAL STATE TO CONFIGURATON FOR PROTOCOLS DOWN THE LINE AAAAAAAAAAAAAAA
             wrapper.user().getProtocolInfo().setState(State.PLAY);
             configurationState.sendQueuedPackets(wrapper.user());
         });
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java
index e8f2abea6..3bb7630a4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java
@@ -75,10 +75,7 @@ public final class EntityPacketRewriter1_20_2 extends EntityRewriter<Clientbound
                     wrapper.write(Type.BYTE, gamemode);
                     wrapper.write(Type.BYTE, previousGamemode);
 
-                    wrapper.passthrough(Type.BOOLEAN); // Debug
-                    wrapper.passthrough(Type.BOOLEAN); // Flat
-                    wrapper.passthrough(Type.OPTIONAL_GLOBAL_POSITION); // Last death position
-                    wrapper.passthrough(Type.VAR_INT); // Portal cooldown
+                    // Debug, flat, last death pos, and portal cooldown at the end unchanged
 
                     // Send configuration packets first before going into the play protocol state
                     final PacketWrapper registryDataPacket = wrapper.create(ClientboundConfigurationPackets1_20_2.REGISTRY_DATA);
@@ -111,7 +108,7 @@ public final class EntityPacketRewriter1_20_2 extends EntityRewriter<Clientbound
                     wrapper.passthrough(Type.STRING); // Dimension type
                     wrapper.passthrough(Type.STRING); // World
                     wrapper.passthrough(Type.LONG); // Seed
-                    wrapper.passthrough(Type.BYTE); // Gamemode
+                    wrapper.write(Type.BYTE, wrapper.read(Type.UNSIGNED_BYTE).byteValue()); // Gamemode
                     wrapper.passthrough(Type.BYTE); // Previous gamemode
                     wrapper.passthrough(Type.BOOLEAN); // Debug
                     wrapper.passthrough(Type.BOOLEAN); // Flat