From aeeb884222cd9f77d6b7f62c9b822574bdcf4721 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sun, 15 Sep 2024 21:55:05 +0200 Subject: [PATCH] Update --- .../viaversion/viabackwards/api/rewriters/EntityRewriter.java | 1 - .../viabackwards/api/rewriters/EntityRewriterBase.java | 2 +- .../viabackwards/api/rewriters/LegacyEntityRewriter.java | 2 +- .../v1_13to1_12_2/rewriter/EntityPacketRewriter1_13.java | 2 +- .../v1_14to1_13_2/rewriter/EntityPacketRewriter1_14.java | 2 +- .../v1_16_2to1_16_1/rewriter/EntityPacketRewriter1_16_2.java | 2 +- .../v1_16to1_15_2/rewriter/EntityPacketRewriter1_16.java | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java index c29b69de4..242f4c67a 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java @@ -127,7 +127,6 @@ public PacketHandler worldTrackerHandlerByKey() { String world = wrapper.get(Types.STRING, 1); if (tracker.currentWorld() != null && !tracker.currentWorld().equals(world)) { tracker.clearEntities(); - tracker.trackClientEntity(); } tracker.setCurrentWorld(world); }; diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java index c9d49cb10..a720700ff 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java @@ -258,7 +258,7 @@ protected PacketHandler getDimensionHandler(int index) { ClientWorld clientWorld = wrapper.user().getClientWorld(this.protocol.getClass()); int dimensionId = wrapper.get(Types.INT, index); if (clientWorld.setEnvironment(dimensionId)) { - onDimensionChange(wrapper.user()); + tracker(wrapper.user()).clearEntities(); } }; } diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java index b10a7598a..08404a2f7 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java @@ -68,7 +68,7 @@ public void register() { handler(wrapper -> { ClientWorld clientWorld = wrapper.user().getClientWorld(protocol.getClass()); if (clientWorld.setEnvironment(wrapper.get(Types.INT, 0))) { - onDimensionChange(wrapper.user()); + tracker(wrapper.user()).clearEntities(); } }); } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/EntityPacketRewriter1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/EntityPacketRewriter1_13.java index 3d3389fca..b103e23b8 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/EntityPacketRewriter1_13.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/EntityPacketRewriter1_13.java @@ -194,7 +194,7 @@ public void register() { int dimensionId = wrapper.get(Types.INT, 0); if (clientWorld.setEnvironment(dimensionId)) { - onDimensionChange(wrapper.user()); + tracker(wrapper.user()).clearEntities(); wrapper.user().get(BackwardsBlockStorage.class).clear(); wrapper.user().get(NoteBlockStorage.class).clear(); } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/EntityPacketRewriter1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/EntityPacketRewriter1_14.java index 2cd0260cc..8e1ad70c9 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/EntityPacketRewriter1_14.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/EntityPacketRewriter1_14.java @@ -333,7 +333,7 @@ public void register() { int dimensionId = wrapper.get(Types.INT, 0); if (clientWorld.setEnvironment(dimensionId)) { - onDimensionChange(wrapper.user()); + tracker(wrapper.user()).clearEntities(); wrapper.user().get(ChunkLightStorage.class).clear(); } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_2to1_16_1/rewriter/EntityPacketRewriter1_16_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_2to1_16_1/rewriter/EntityPacketRewriter1_16_2.java index 642febb5d..5034b24c1 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_2to1_16_1/rewriter/EntityPacketRewriter1_16_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16_2to1_16_1/rewriter/EntityPacketRewriter1_16_2.java @@ -109,7 +109,7 @@ public void register() { CompoundTag dimensionData = wrapper.read(Types.NAMED_COMPOUND_TAG); wrapper.write(Types.STRING, getDimensionFromData(dimensionData)); - onDimensionChange(wrapper.user()); + tracker(wrapper.user()).clearEntities(); }); } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/EntityPacketRewriter1_16.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/EntityPacketRewriter1_16.java index fa9c55166..302f888ac 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/EntityPacketRewriter1_16.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/EntityPacketRewriter1_16.java @@ -128,7 +128,7 @@ public void register() { } if (clientWorld.setEnvironment(dimension)) { - onDimensionChange(wrapper.user()); + tracker(wrapper.user()).clearEntities(); } wrapper.write(Types.STRING, "default"); // Level type