Merge pull request #49 from SpigotMC/master

SpigotMC#1859: Fix EntityMap for leads.
HexagonMC · Jun 27, 2016 · 4f60998 · 4f60998
2 parents 8d66be3 + c5ac5a0
commit 4f60998
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java
@@ -34,6 +34,7 @@ class EntityMap_1_10 extends EntityMap
         addRewrite( 0x34, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Head Look : PacketPlayOutEntityHeadRotation
         addRewrite( 0x36, ProtocolConstants.Direction.TO_CLIENT, true ); // Camera : PacketPlayOutCamera
         addRewrite( 0x39, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Metadata : PacketPlayOutEntityMetadata
+        addRewrite( 0x3A, ProtocolConstants.Direction.TO_CLIENT, true ); // Attach Entity : PacketPlayOutAttachEntity
         addRewrite( 0x3B, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Velocity : PacketPlayOutEntityVelocity
         addRewrite( 0x3C, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Equipment : PacketPlayOutEntityEquipment
         addRewrite( 0x40, ProtocolConstants.Direction.TO_CLIENT, true ); // Attach Entity : PacketPlayOutMount
@@ -59,6 +60,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId)
         int jumpIndex = packet.readerIndex();
         switch ( packetId )
         {
+            case 0x3A /* Attach Entity : PacketPlayOutAttachEntity */:
             case 0x48 /* Collect Item : PacketPlayOutCollect */:
                 DefinedPacket.readVarInt( packet );
                 rewriteVarInt( packet, oldId, newId, packet.readerIndex() );

diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java
@@ -34,6 +34,7 @@ class EntityMap_1_9 extends EntityMap
         addRewrite( 0x34, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Head Look : PacketPlayOutEntityHeadRotation
         addRewrite( 0x36, ProtocolConstants.Direction.TO_CLIENT, true ); // Camera : PacketPlayOutCamera
         addRewrite( 0x39, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Metadata : PacketPlayOutEntityMetadata
+        addRewrite( 0x3A, ProtocolConstants.Direction.TO_CLIENT, true ); // Attach Entity : PacketPlayOutAttachEntity
         addRewrite( 0x3B, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Velocity : PacketPlayOutEntityVelocity
         addRewrite( 0x3C, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Equipment : PacketPlayOutEntityEquipment
         addRewrite( 0x40, ProtocolConstants.Direction.TO_CLIENT, true ); // Attach Entity : PacketPlayOutMount
@@ -59,6 +60,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId)
         int jumpIndex = packet.readerIndex();
         switch ( packetId )
         {
+            case 0x3A /* Attach Entity : PacketPlayOutAttachEntity */:
             case 0x49 /* Collect Item : PacketPlayOutCollect */:
                 DefinedPacket.readVarInt( packet );
                 rewriteVarInt( packet, oldId, newId, packet.readerIndex() );

diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java
@@ -34,6 +34,7 @@ class EntityMap_1_9_4 extends EntityMap
         addRewrite( 0x34, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Head Look : PacketPlayOutEntityHeadRotation
         addRewrite( 0x36, ProtocolConstants.Direction.TO_CLIENT, true ); // Camera : PacketPlayOutCamera
         addRewrite( 0x39, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Metadata : PacketPlayOutEntityMetadata
+        addRewrite( 0x3A, ProtocolConstants.Direction.TO_CLIENT, true ); // Attach Entity : PacketPlayOutAttachEntity
         addRewrite( 0x3B, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Velocity : PacketPlayOutEntityVelocity
         addRewrite( 0x3C, ProtocolConstants.Direction.TO_CLIENT, true ); // Entity Equipment : PacketPlayOutEntityEquipment
         addRewrite( 0x40, ProtocolConstants.Direction.TO_CLIENT, true ); // Attach Entity : PacketPlayOutMount
@@ -59,6 +60,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId)
         int jumpIndex = packet.readerIndex();
         switch ( packetId )
         {
+            case 0x3A /* Attach Entity : PacketPlayOutAttachEntity */:
             case 0x48 /* Collect Item : PacketPlayOutCollect */:
                 DefinedPacket.readVarInt( packet );
                 rewriteVarInt( packet, oldId, newId, packet.readerIndex() );