From f00ccbf5baaf201718edc957b8e9167d424e8d87 Mon Sep 17 00:00:00 2001
From: Alex 'mcmonkey' Goodwin <agoodwin@freneticllc.com>
Date: Mon, 2 Dec 2019 04:40:22 -0800
Subject: [PATCH] fix errors with attach_to

---
 .../handlers/DenizenNetworkManagerImpl.java   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/impl/network/handlers/DenizenNetworkManagerImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/impl/network/handlers/DenizenNetworkManagerImpl.java
index 2b16f13bee..93c9692534 100644
--- a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/impl/network/handlers/DenizenNetworkManagerImpl.java
+++ b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -151,9 +151,9 @@ public void sendPacket(Packet<?> packet, GenericFutureListener<? extends Future<
         oldManager.sendPacket(packet, genericfuturelistener);
     }
 
-    public boolean isAttached(Entity e) {
+    public boolean shouldSendAttachOriginal(Entity e) {
         UUID attached = NMSHandler.getInstance().attachmentsA.get(e.getUniqueID());
-        return attached != null && attached.equals(player.getUniqueID());
+        return attached != null && !attached.equals(player.getUniqueID());
     }
 
     public boolean processAttachToForPacket(Packet<?> packet) {
@@ -198,17 +198,20 @@ public boolean processAttachToForPacket(Packet<?> packet) {
                                 POS_Y_PACKTELENT.setDouble(newTeleportPacket, goalPosition.getY());
                                 POS_Z_PACKTELENT.setDouble(newTeleportPacket, goalPosition.getZ());
                                 oldManager.sendPacket(newTeleportPacket);
-                                return true;
                             }
-                            POS_X_PACKENT.setInt(pNew, MathHelper.clamp(offX, Short.MIN_VALUE, Short.MAX_VALUE));
-                            POS_Y_PACKENT.setInt(pNew, MathHelper.clamp(offY, Short.MIN_VALUE, Short.MAX_VALUE));
-                            POS_Z_PACKENT.setInt(pNew, MathHelper.clamp(offZ, Short.MIN_VALUE, Short.MAX_VALUE));
+                            else {
+                                POS_X_PACKENT.setShort(pNew, (short) MathHelper.clamp(offX, Short.MIN_VALUE, Short.MAX_VALUE));
+                                POS_Y_PACKENT.setShort(pNew, (short) MathHelper.clamp(offY, Short.MIN_VALUE, Short.MAX_VALUE));
+                                POS_Z_PACKENT.setShort(pNew, (short) MathHelper.clamp(offZ, Short.MIN_VALUE, Short.MAX_VALUE));
+                                oldManager.sendPacket(pNew);
+                            }
+                        }
+                        else {
+                            oldManager.sendPacket(pNew);
                         }
-                        oldManager.sendPacket(pNew);
-                        return true;
                     }
                 }
-                return isAttached(e);
+                return shouldSendAttachOriginal(e);
             }
             else if (packet instanceof PacketPlayOutEntityVelocity) {
                 int ider = ENTITY_ID_PACKVELENT.getInt(packet);
@@ -223,10 +226,9 @@ else if (packet instanceof PacketPlayOutEntityVelocity) {
                         Packet pNew = (Packet) duplo(packet);
                         ENTITY_ID_PACKVELENT.setInt(pNew, target.getEntityId());
                         oldManager.sendPacket(pNew);
-                        return true;
                     }
                 }
-                return isAttached(e);
+                return shouldSendAttachOriginal(e);
             }
             else if (packet instanceof PacketPlayOutEntityTeleport) {
                 int ider = ENTITY_ID_PACKTELENT.getInt(packet);
@@ -258,10 +260,9 @@ else if (packet instanceof PacketPlayOutEntityTeleport) {
                         }
                         NMSHandler.getInstance().visiblePositions.put(target.getUniqueId(), resultPos);
                         oldManager.sendPacket(pNew);
-                        return true;
                     }
                 }
-                return isAttached(e);
+                return shouldSendAttachOriginal(e);
             }
         }
         catch (Exception ex) {