attach command debugging and auto-cleanup

DenizenScript · Mar 3, 2021 · 21a1c16 · 21a1c16
1 parent cb2c6bd
commit 21a1c16
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/entity/EntityAttachmentHelper.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/entity/EntityAttachmentHelper.java
@@ -47,12 +47,16 @@ public void startTask() {
                 checkTask.cancel();
             }
             BukkitRunnable runnable = new BukkitRunnable() {
+                int ticks = 0;
                 @Override
                 public void run() {
                     if (!attached.isValid() || !to.isValid()) {
                         cancelAndRemove();
                         return;
                     }
+                    if (ticks++ >= 20 * 10) { // Run a forcetele every 10 seconds to guarantee sync
+                        visiblePositions.clear();
+                    }
                     if (syncServer) {
                         Location goal = to.getLocation();
                         if (positionalOffset != null) {

diff --git a/.../com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -427,6 +427,9 @@ else if (isRotate) {
                             POS_Z_PACKTELENT.setDouble(newTeleportPacket, goalPosition.getZ());
                             YAW_PACKTELENT.setByte(newTeleportPacket, yaw);
                             PITCH_PACKTELENT.setByte(newTeleportPacket, pitch);
+                            if (NMSHandler.debugPackets) {
+                                Debug.log("Attach Move-Tele Packet: " + newTeleportPacket.getClass().getCanonicalName() + " for " + att.attached.getUUID() + " sent to " + player.getName());
+                            }
                             oldManager.sendPacket(newTeleportPacket);
                         }
                         else {
@@ -437,10 +440,16 @@ else if (isRotate) {
                                 YAW_PACKENT.setByte(pNew, yaw);
                                 PITCH_PACKENT.setByte(pNew, pitch);
                             }
+                            if (NMSHandler.debugPackets) {
+                                Debug.log("Attach Move Packet: " + pNew.getClass().getCanonicalName() + " for " + att.attached.getUUID() + " sent to " + player.getName());
+                            }
                             oldManager.sendPacket(pNew);
                         }
                     }
                     else {
+                        if (NMSHandler.debugPackets) {
+                            Debug.log("Attach Replica-Move Packet: " + pNew.getClass().getCanonicalName() + " for " + att.attached.getUUID() + " sent to " + player.getName());
+                        }
                         oldManager.sendPacket(pNew);
                     }
                 }
@@ -461,6 +470,9 @@ public void tryProcessVelocityPacketForAttach(Packet<?> packet, Entity e) throws
                 if (attMap.attached.isValid() && att != null) {
                     Packet pNew = (Packet) duplo(packet);
                     ENTITY_ID_PACKVELENT.setInt(pNew, att.attached.getBukkitEntity().getEntityId());
+                    if (NMSHandler.debugPackets) {
+                        Debug.log("Attach Velocity Packet: " + pNew.getClass().getCanonicalName() + " for " + att.attached.getUUID() + " sent to " + player.getName());
+                    }
                     oldManager.sendPacket(pNew);
                 }
             }
@@ -502,6 +514,9 @@ public void tryProcessTeleportPacketForAttach(Packet<?> packet, Entity e, Vector
                         PITCH_PACKTELENT.setByte(pNew, pitch);
                     }
                     att.visiblePositions.put(player.getUniqueID(), resultPos.clone());
+                    if (NMSHandler.debugPackets) {
+                        Debug.log("Attach Teleport Packet: " + pNew.getClass().getCanonicalName() + " for " + att.attached.getUUID() + " sent to " + player.getName());
+                    }
                     oldManager.sendPacket(pNew);
                 }
             }