From a52ea50006ef8d1fb2388a25d4a5986f197bdb8a Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 10 Feb 2020 10:28:47 +1100 Subject: [PATCH] #2769: Guardian target beam lost on server change --- .../src/main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java | 1 + .../src/main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java | 1 + .../src/main/java/net/md_5/bungee/entitymap/EntityMap_1_12.java | 1 + .../main/java/net/md_5/bungee/entitymap/EntityMap_1_12_1.java | 1 + .../src/main/java/net/md_5/bungee/entitymap/EntityMap_1_13.java | 1 + .../src/main/java/net/md_5/bungee/entitymap/EntityMap_1_14.java | 1 + .../src/main/java/net/md_5/bungee/entitymap/EntityMap_1_15.java | 1 + proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java | 1 + .../src/main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java | 1 + 9 files changed, 9 insertions(+) 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 index 39efaf99..6db530c3 100644 --- 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 @@ class EntityMap_1_10 extends EntityMap 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 index 6047fcb5..36822127 100644 --- 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 @@ class EntityMap_1_11 extends EntityMap 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 index 54221465..38e12ce4 100644 --- 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 @@ class EntityMap_1_12 extends EntityMap 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 index 75d651c5..5f296839 100644 --- 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 @@ class EntityMap_1_12_1 extends EntityMap 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 index d737fe25..f3372f08 100644 --- 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 @@ class EntityMap_1_13 extends EntityMap 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 index e9702b16..8210b0a7 100644 --- 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 @@ class EntityMap_1_14 extends EntityMap 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 index ea9e5ec9..c2cf810f 100644 --- 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 @@ class EntityMap_1_15 extends EntityMap 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 index a4d0ea3f..d61dc0cb 100644 --- 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 @@ class EntityMap_1_9 extends EntityMap 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 index ae7ff10e..bfbc8432 100644 --- 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 @@ class EntityMap_1_9_4 extends EntityMap 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 );