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

40 lines
1.5 KiB
Diff
Raw Normal View History

From 36f8bbc61f94489ba77a4a775807e75b716fe735 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 d017cc8e6..7700652e1 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2019-05-06 02:58:04 +00:00
@@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
2019-04-27 06:26:04 +00:00
public boolean af;
public boolean impulse;
public int portalCooldown;
2019-04-27 06:26:04 +00:00
- protected boolean ai;
+ protected boolean ai; public final boolean inPortal() { return this.ai; } // Paper - OBFHELPER
protected int aj;
public DimensionManager dimension;
2019-04-27 06:26:04 +00:00
protected BlockPosition al;
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index 9cbcce446..3b10043ba 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
2019-04-27 06:26:04 +00:00
@@ -163,6 +163,12 @@ public class EntityFishingHook extends Entity {
this.setMot(this.getMot().a(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