From d600c9a526ba9234e84150aad959079ac278f635 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 8 Jan 2018 12:50:53 +1100
Subject: [PATCH] #2323: Attempt to rewrite fishing hook data

---
 .../main/java/net/md_5/bungee/entitymap/EntityMap_1_10.java   | 4 ++++
 .../main/java/net/md_5/bungee/entitymap/EntityMap_1_11.java   | 1 +
 .../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 +
 .../main/java/net/md_5/bungee/entitymap/EntityMap_1_9.java    | 4 ++++
 .../main/java/net/md_5/bungee/entitymap/EntityMap_1_9_4.java  | 4 ++++
 6 files changed, 15 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 a89ea2e9..1232e833 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
@@ -147,6 +147,10 @@ class EntityMap_1_10 extends EntityMap
                     rewriteInt( packet, oldId, newId, packet.readerIndex() );
                 }
                 break;
+            case 0x39 /* EntityMetadata : PacketPlayOutEntityMetadata */:
+                DefinedPacket.readVarInt( packet ); // Entity ID
+                rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
+                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 260da17e..7048b01c 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
@@ -149,6 +149,7 @@ class EntityMap_1_11 extends EntityMap
                 break;
             case 0x39 /* EntityMetadata : PacketPlayOutEntityMetadata */:
                 DefinedPacket.readVarInt( packet ); // Entity ID
+                rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7 ); // fireworks (et al)
                 break;
         }
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 618a9a28..2152f94c 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
@@ -149,6 +149,7 @@ class EntityMap_1_12 extends EntityMap
                 break;
             case 0x3B /* EntityMetadata : PacketPlayOutEntityMetadata */:
                 DefinedPacket.readVarInt( packet ); // Entity ID
+                rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7 ); // fireworks (et al)
                 break;
         }
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 95a944e6..d8901eb7 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
@@ -149,6 +149,7 @@ class EntityMap_1_12_1 extends EntityMap
                 break;
             case 0x3C /* EntityMetadata : PacketPlayOutEntityMetadata */:
                 DefinedPacket.readVarInt( packet ); // Entity ID
+                rewriteMetaVarInt( packet, oldId + 1, newId + 1, 6 ); // fishing hook
                 rewriteMetaVarInt( packet, oldId, newId, 7 ); // fireworks (et al)
                 break;
         }
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 19d96776..55b65774 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
@@ -147,6 +147,10 @@ class EntityMap_1_9 extends EntityMap
                     rewriteInt( packet, oldId, newId, packet.readerIndex() );
                 }
                 break;
+            case 0x39 /* EntityMetadata : PacketPlayOutEntityMetadata */:
+                DefinedPacket.readVarInt( packet ); // Entity ID
+                rewriteMetaVarInt( packet, oldId + 1, newId + 1, 5 ); // fishing hook
+                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 412ab4ed..3d41025f 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
@@ -147,6 +147,10 @@ class EntityMap_1_9_4 extends EntityMap
                     rewriteInt( packet, oldId, newId, packet.readerIndex() );
                 }
                 break;
+            case 0x39 /* EntityMetadata : PacketPlayOutEntityMetadata */:
+                DefinedPacket.readVarInt( packet ); // Entity ID
+                rewriteMetaVarInt( packet, oldId + 1, newId + 1, 5 ); // fishing hook
+                break;
         }
         packet.readerIndex( readerIndex );
     }