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

40 lines
1.5 KiB
Diff
Raw Normal View History

2017-01-29 00:36:03 +01:00
From 99ab310d8306e8ee1495804516c0a7fc7887400f 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
2017-01-29 00:36:03 +01:00
index a3685ec57..66563584f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2016-12-20 23:34:27 +01:00
@@ -143,7 +143,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
2017-01-29 00:36:03 +01:00
index 0c528c699..606160a17 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
2016-12-20 23:34:27 +01:00
@@ -185,6 +185,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
}
}
--
2017-01-29 00:36:03 +01:00
2.11.0