Paper/Spigot-Server-Patches/0152-Don-t-let-fishinghooks-use-portals.patch

40 lines
1.5 KiB
Diff
Raw Normal View History

From 8d513424da1fcbd8b169d842586a0adf68658f9a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.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 5bd129bcaf..7f430e590f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -158,7 +158,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 b52aaa57e3..62e8f27aa7 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.18.0