Track player ids correctly

ViaVersion · Oct 26, 2023 · 784a444 · 784a444
1 parent b1f153e
commit 784a444
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/common/src/main/java/com/viaversion/viarewind/api/rewriter/ReplacementEntityTracker.java b/common/src/main/java/com/viaversion/viarewind/api/rewriter/ReplacementEntityTracker.java
@@ -64,6 +64,10 @@ public void updateMetadata(final int entityId, final List<Metadata> metadata) {
 		metadata.add(new Metadata(MetaIndex1_7_6_10To1_8.ENTITY_LIVING_NAME_TAG.getNewIndex(), MetaType1_7_6_10.String, name));
 	}
 
+	public void setPlayerId(int playerId) {
+		this.playerId = playerId;
+	}
+
 	@Override
 	public void setClientEntityId(int entityId) {
 		removeEntity(this.playerId);

diff --git a/...n/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/PlayerPackets.java b/...n/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/PlayerPackets.java
@@ -72,7 +72,7 @@ public void register() {
 					}
 
 					final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
-					tracker.setClientEntityId(wrapper.get(Type.INT, 0));
+					tracker.setPlayerId(wrapper.get(Type.INT, 0));
 					tracker.addPlayer(wrapper.get(Type.INT, 0), wrapper.user().getProtocolInfo().getUuid());
 
 					wrapper.user().get(PlayerSessionStorage.class).gameMode = wrapper.get(Type.UNSIGNED_BYTE, 0);

diff --git a/...om/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/storage/EntityTracker1_7_6_10.java b/...om/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/storage/EntityTracker1_7_6_10.java
@@ -80,8 +80,16 @@ public void clear() {
 
 	@Override
 	public void setClientEntityId(int entityId) {
+		if (this.spectatingPlayerId == this.getPlayerId()) {
+			this.spectatingPlayerId = entityId;
+		}
 		super.setClientEntityId(entityId);
-		spectatingPlayerId = entityId;
+	}
+
+	@Override
+	public void setPlayerId(int playerId) {
+		super.setPlayerId(playerId);
+		this.spectatingPlayerId = playerId;
 	}
 
 	public void addPlayer(final Integer entityId, final UUID uuid) {