workaround paper bug for hide_entity

DenizenScript · May 30, 2020 · aaeabdd · aaeabdd
1 parent cd44382
commit aaeabdd
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/EntityHelperImpl.java b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/EntityHelperImpl.java
@@ -1,5 +1,6 @@
 package com.denizenscript.denizen.nms.v1_15.helpers;
 
+import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.nms.NMSHandler;
 import com.denizenscript.denizen.nms.util.ReflectionHelper;
 import com.denizenscript.denizen.nms.v1_15.impl.blocks.BlockDataImpl;
@@ -445,13 +446,15 @@ public void sendHidePacket(Player pl, Entity entity) {
         CraftPlayer craftPlayer = (CraftPlayer) pl;
         EntityPlayer entityPlayer = craftPlayer.getHandle();
         if (entityPlayer.playerConnection != null && !craftPlayer.equals(entity)) {
-            // TODO: 1.14 - make sure this works
             PlayerChunkMap tracker = ((WorldServer) craftPlayer.getHandle().world).getChunkProvider().playerChunkMap;
             net.minecraft.server.v1_15_R1.Entity other = ((CraftEntity) entity).getHandle();
             PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
             if (entry != null) {
                 entry.clear(entityPlayer);
             }
+            if (Denizen.supportsPaper) { // Workaround for Paper issue
+                entityPlayer.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(other.getId()));
+            }
         }
     }
 
@@ -464,7 +467,6 @@ public void sendShowPacket(Player pl, Entity entity) {
         CraftPlayer craftPlayer = (CraftPlayer) pl;
         EntityPlayer entityPlayer = craftPlayer.getHandle();
         if (entityPlayer.playerConnection != null && !craftPlayer.equals(entity)) {
-            // TODO: 1.14 - same as hide packet above
             PlayerChunkMap tracker = ((WorldServer) craftPlayer.getHandle().world).getChunkProvider().playerChunkMap;
             net.minecraft.server.v1_15_R1.Entity other = ((CraftEntity) entity).getHandle();
             PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());