Check if client entity id is set

ViaVersion · Sep 17, 2024 · 724a6b7 · 724a6b7
1 parent c785df5
commit 724a6b7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...va/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/EntityPacketRewriter1_8.java b/...va/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/EntityPacketRewriter1_8.java
@@ -83,7 +83,6 @@ public void register() {
 					final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
 					tracker.addPlayer(entityId, wrapper.user().getProtocolInfo().getUuid());
 
-					tracker.setClientEntityId(entityId);
 					tracker.setClientEntityGameMode(wrapper.get(Types.UNSIGNED_BYTE, 0));
 
 					// Reset on Velocity server change

diff --git a/.../main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/EntityTracker1_8.java b/.../main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/EntityTracker1_8.java
@@ -87,7 +87,7 @@ public void clearEntities() {
 
 	@Override
 	public void setClientEntityId(int entityId) {
-		if (this.spectatingClientEntityId == this.clientEntityId()) {
+		if (this.hasClientEntityId() && this.spectatingClientEntityId == this.clientEntityId()) {
 			this.spectatingClientEntityId = entityId;
 		}
 		super.setClientEntityId(entityId);