mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
18c3716c49
This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 5f57f26f976b45cda5fcda4dffebc4981d748109 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 c675a6e16..f71528b5f 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -144,7 +144,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
|
|
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
|
|
index 339d1f1b1..7f011aef8 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
@@ -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.18.0
|
|
|