From b17aa5f5ba65f7c1bc978188c374c296e8a86d8a Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 16 Dec 2016 16:03:56 -0600
Subject: [PATCH] Don't let FishingHooks use portals

Closes GH-531
---
 .../Don-t-let-fishinghooks-use-portals.patch  | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 Spigot-Server-Patches/Don-t-let-fishinghooks-use-portals.patch

diff --git a/Spigot-Server-Patches/Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/Don-t-let-fishinghooks-use-portals.patch
new file mode 100644
index 0000000000..84e4cee619
--- /dev/null
+++ b/Spigot-Server-Patches/Don-t-let-fishinghooks-use-portals.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Fri, 16 Dec 2016 16:03:19 -0600
+Subject: [PATCH] Don't let fishinghooks use portals
+
+
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
+     public boolean ah;
+     public boolean impulse;
+     public int portalCooldown;
+-    protected boolean ak;
++    protected boolean ak; public boolean inPortal() { return ak; } // Paper - OBFHELPER
+     protected int al;
+     public int dimension;
+     protected BlockPosition an;
+diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
++++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
+@@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {
+             this.motY *= 0.92D;
+             this.motZ *= 0.92D;
+             this.setPosition(this.locX, this.locY, this.locZ);
++
++            // Paper start - These shouldn't be going through portals
++            if (this.inPortal()) {
++                this.die();
++            }
++            // Paper end
+         }
+     }
+ 
+--
\ No newline at end of file