#2769: Guardian target beam lost on server change

SpigotMC · Feb 9, 2020 · a52ea50 · a52ea50
1 parent 17d5dd3
commit a52ea50
Show file tree

Hide file tree

Showing 9 changed files with 9 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
@@ -149,6 +149,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId)
             case 0x39 /* EntityMetadata : PacketPlayOutEntityMetadata */:
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
+                rewriteMetaVarInt( packet, oldId, newId, 13 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );

diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java
@@ -150,6 +150,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId)
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7 ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 13 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );

diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java
@@ -150,6 +150,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId)
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7 ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 13 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );

diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java
@@ -150,6 +150,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId)
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7 ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 13 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );

diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java
@@ -150,6 +150,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId, int protoco
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6, protocolVersion ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7, protocolVersion ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 13, protocolVersion ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );

diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java
@@ -149,6 +149,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId, int protoco
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 7, protocolVersion ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 8, protocolVersion ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 15, protocolVersion ); // guardian beam
                 break;
             case 0x50 /* Entity Sound Effect : PacketPlayOutEntitySound */:
                 DefinedPacket.readVarInt( packet );

diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java
@@ -149,6 +149,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId, int protoco
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 7, protocolVersion ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 8, protocolVersion ); // fireworks (et al)
+                rewriteMetaVarInt( packet, oldId, newId, 16, protocolVersion ); // guardian beam
                 break;
             case 0x51 /* Entity Sound Effect : PacketPlayOutEntitySound */:
                 DefinedPacket.readVarInt( packet );

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
@@ -149,6 +149,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId)
             case 0x39 /* EntityMetadata : PacketPlayOutEntityMetadata */:
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 5 ); // fishing hook
+                rewriteMetaVarInt( packet, oldId, newId, 12 ); // guardian beam
                 break;
         }
         packet.readerIndex( 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
@@ -149,6 +149,7 @@ public void rewriteClientbound(ByteBuf packet, int oldId, int newId)
             case 0x39 /* EntityMetadata : PacketPlayOutEntityMetadata */:
                 DefinedPacket.readVarInt( packet ); // Entity ID
                 rewriteMetaVarInt( packet, oldId + 1, newId + 1, 5 ); // fishing hook
+                rewriteMetaVarInt( packet, oldId, newId, 12 ); // guardian beam
                 break;
         }
         packet.readerIndex( readerIndex );