Fixup entity id

AlexProgrammerDE · Dec 13, 2024 · 799d74e · 799d74e
1 parent f2d504f
commit 799d74e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/SessionDataManager.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/SessionDataManager.java
@@ -296,12 +296,12 @@ public void onRespawn(ClientboundRespawnPacket packet) {
     }
 
     var oldLocalPlayer = localPlayer;
-    var newLocalPlayer = packet.isKeepMetadata() ? new LocalPlayer(connection, currentLevel(), botProfile, localPlayer.isShiftKeyDown(), localPlayer.isSprinting())
+    var newLocalPlayer = packet.isKeepMetadata() ? new LocalPlayer(connection, currentLevel(), botProfile, oldLocalPlayer.isShiftKeyDown(), oldLocalPlayer.isSprinting())
       : new LocalPlayer(connection, currentLevel(), botProfile);
-    connection.inventoryManager().setContainer(0, localPlayer.inventory());
+    connection.inventoryManager().setContainer(0, newLocalPlayer.inventory());
 
     this.startWaitingForNewLevel(newLocalPlayer, currentLevel());
-    localPlayer.entityId(oldLocalPlayer.entityId());
+    newLocalPlayer.entityId(oldLocalPlayer.entityId());
 
     this.localPlayer = newLocalPlayer;
     if (packet.isKeepMetadata()) {
@@ -321,7 +321,7 @@ public void onRespawn(ClientboundRespawnPacket packet) {
       newLocalPlayer.attributeState().assignBaseValues(oldLocalPlayer.attributeState());
     }
 
-    entityTrackerState.addEntity(localPlayer);
+    entityTrackerState.addEntity(newLocalPlayer);
 
     this.gameModeState.adjustPlayer(newLocalPlayer);
     newLocalPlayer.setReducedDebugInfo(oldLocalPlayer.isReducedDebugInfo());