Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 03:20:07 +01:00
40 Zeilen
1.5 KiB
Diff
40 Zeilen
1.5 KiB
Diff
From 60eab5063789e0ce5d62881948cad28c890e40d7 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 44709d5d46..58f7bb658f 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 af;
|
|
public boolean impulse;
|
|
public int portalCooldown;
|
|
- protected boolean ai;
|
|
+ protected boolean ai; public final boolean inPortal() { return this.ai; } // Paper - OBFHELPER
|
|
protected int aj;
|
|
public DimensionManager dimension;
|
|
protected BlockPosition al;
|
|
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
index 84e6d660d3..74b726937e 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
@@ -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.22.0
|
|
|