blob: 0650b7eabc0ef72116702dec395d25cdaf196a98 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 5b2757104d7ef336e2b64ced2a0d0662eae91cc6 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 113264981e..b6ed9082fd 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -156,7 +156,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 118b974d76..861fc6fd5c 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.21.0
|
