EntityTag.reset_client_location

DenizenScript · Jun 4, 2022 · 3e407d8 · 3e407d8
1 parent a9e43dc
commit 3e407d8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java
@@ -305,6 +305,10 @@ public void fakeMove(Entity entity, Vector vector) {
         throw new UnsupportedOperationException();
     }
 
+    public void clientResetLoc(Entity entity) {
+        throw new UnsupportedOperationException();
+    }
+
     public abstract void teleport(Entity entity, Location loc);
 
     public abstract BoundingBox getBoundingBox(Entity entity);

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -3474,6 +3474,17 @@ public void adjust(Mechanism mechanism) {
             NMSHandler.entityHelper.fakeMove(getBukkitEntity(), mechanism.valueAsType(LocationTag.class).toVector());
         }
 
+        // <--[mechanism]
+        // @object EntityTag
+        // @name reset_client_location
+        // @input None
+        // @description
+        // Causes an entity to broadcast a fake teleport packet to its own location, forcibly resetting its location for clients.
+        // -->
+        if (mechanism.matches("reset_client_location")) {
+            NMSHandler.entityHelper.clientResetLoc(getBukkitEntity());
+        }
+
         // <--[mechanism]
         // @object EntityTag
         // @name interact_with

diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java
@@ -16,6 +16,7 @@
 import net.minecraft.network.protocol.game.ClientboundMoveEntityPacket;
 import net.minecraft.network.protocol.game.ClientboundPlayerLookAtPacket;
 import net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket;
+import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
@@ -633,6 +634,14 @@ public void fakeMove(Entity entity, Vector vector) {
         }
     }
 
+    @Override
+    public void clientResetLoc(Entity entity) {
+        ClientboundTeleportEntityPacket packet = new ClientboundTeleportEntityPacket(((CraftEntity) entity).getHandle());
+        for (Player player : getPlayersThatSee(entity)) {
+            PacketHelperImpl.send(player, packet);
+        }
+    }
+
     @Override
     public void teleport(Entity entity, Location loc) {
         net.minecraft.world.entity.Entity nmsEntity = ((CraftEntity) entity).getHandle();