2016-12-16 23:03:56 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Zach Brown <1254957+zachbr@users.noreply.github.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
|
2020-05-06 11:48:49 +02:00
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
2016-12-16 23:03:56 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2018-07-16 22:08:09 +02:00
|
|
|
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2019-12-12 00:43:22 +01:00
|
|
|
public boolean ac;
|
2016-12-16 23:03:56 +01:00
|
|
|
public boolean impulse;
|
|
|
|
public int portalCooldown;
|
2020-06-25 14:04:34 +02:00
|
|
|
- protected boolean inPortal;
|
|
|
|
+ protected boolean inPortal; public final boolean inPortal() { return this.inPortal; } // Paper - OBFHELPER
|
|
|
|
protected int portalTicks;
|
|
|
|
protected BlockPosition ah;
|
|
|
|
protected Vec3D ai;
|
2016-12-16 23:03:56 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
2020-05-06 11:48:49 +02:00
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
2016-12-16 23:03:56 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
2020-06-25 14:04:34 +02:00
|
|
|
@@ -0,0 +0,0 @@ public class EntityFishingHook extends IProjectile {
|
2019-04-27 08:26:04 +02:00
|
|
|
|
|
|
|
this.setMot(this.getMot().a(0.92D));
|
2020-06-25 14:04:34 +02:00
|
|
|
this.ac();
|
2016-12-16 23:03:56 +01:00
|
|
|
+
|
|
|
|
+ // Paper start - These shouldn't be going through portals
|
|
|
|
+ if (this.inPortal()) {
|
|
|
|
+ this.die();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|