papermc/Spigot-Server-Patches/0180-Don-t-let-fishinghooks-use-portals.patch

40 lines
1.5 KiB
Diff
Raw Normal View History

2017-01-06 21:45:59 +00:00
From 87609853bade8009dc80b9102205cd0c2c36d630 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-06 21:45:59 +00:00
index b2fd599..5e3f697 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2016-12-20 22:34:27 +00: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
2016-12-20 22:34:27 +00:00
index 0c528c6..606160a 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
2016-12-20 22:34:27 +00: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
}
}
--
2.9.3