From 23fa74cd73f85ca708127c9e169b9bcdfbff76ec 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 1aade318ef..3b948d0805 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -161,7 +161,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke public boolean ac; public boolean impulse; public int portalCooldown; - protected boolean af; + protected boolean af; public final boolean inPortal() { return this.af; } // Paper - OBFHELPER protected int ag; public DimensionManager dimension; protected BlockPosition ai; diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java index 40bdcf4e75..39e3bd3795 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -160,6 +160,12 @@ public class EntityFishingHook extends Entity { this.setMot(this.getMot().a(0.92D)); this.Z(); + + // Paper start - These shouldn't be going through portals + if (this.inPortal()) { + this.die(); + } + // Paper end } } -- 2.26.2