diff options
Diffstat (limited to 'Spigot-Server-Patches/0150-Don-t-let-fishinghooks-use-portals.patch')
| -rw-r--r-- | Spigot-Server-Patches/0150-Don-t-let-fishinghooks-use-portals.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0150-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0150-Don-t-let-fishinghooks-use-portals.patch new file mode 100644 index 0000000000..0650b7eabc --- /dev/null +++ b/Spigot-Server-Patches/0150-Don-t-let-fishinghooks-use-portals.patch @@ -0,0 +1,39 @@ +From 5b2757104d7ef336e2b64ced2a0d0662eae91cc6 Mon Sep 17 00:00:00 2001 +From: Zach Brown <[email protected]> +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 113264981e..b6ed9082fd 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke + public boolean ak; + public boolean impulse; + public int portalCooldown; +- protected boolean an; ++ protected boolean an; public boolean inPortal() { return an; } // Paper - OBFHELPER + protected int ao; + public DimensionManager dimension; + protected BlockPosition aq; +diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java +index 118b974d76..861fc6fd5c 100644 +--- a/src/main/java/net/minecraft/server/EntityFishingHook.java ++++ b/src/main/java/net/minecraft/server/EntityFishingHook.java +@@ -190,6 +190,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.21.0 + |