From 7c567d6ed43b607715dc67cadedf05a521fb0aea Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Dec 2016 16:03:56 -0600 Subject: [PATCH] Don't let FishingHooks use portals Closes GH-531 --- ...4-Don-t-let-fishinghooks-use-portals.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 Spigot-Server-Patches/0184-Don-t-let-fishinghooks-use-portals.patch diff --git a/Spigot-Server-Patches/0184-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0184-Don-t-let-fishinghooks-use-portals.patch new file mode 100644 index 0000000000..05dd7c1a56 --- /dev/null +++ b/Spigot-Server-Patches/0184-Don-t-let-fishinghooks-use-portals.patch @@ -0,0 +1,39 @@ +From 7c1bdce92a95818298f913731cb8ee840e990c39 Mon Sep 17 00:00:00 2001 +From: Zach Brown +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 7de4b5b..79bbc8e 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -142,7 +142,7 @@ 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 7771243..64e89e7 100644 +--- a/src/main/java/net/minecraft/server/EntityFishingHook.java ++++ b/src/main/java/net/minecraft/server/EntityFishingHook.java +@@ -175,6 +175,12 @@ 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 + } + } + +-- +2.9.3 +