core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0175-Don-t-let-fishinghooks...

40 lines
1.5 KiB
Diff
Raw Normal View History

Current Chunk for Entity and Block Entities, counts by entity type 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.
2018-07-04 07:55:24 +00:00
From 5f57f26f976b45cda5fcda4dffebc4981d748109 Mon Sep 17 00:00:00 2001
Don't let FishingHooks use portals Closes GH-531
2016-12-16 22:03:56 +00:00
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
Current Chunk for Entity and Block Entities, counts by entity type 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.
2018-07-04 07:55:24 +00:00
index c675a6e16..f71528b5f 100644
Don't let FishingHooks use portals Closes GH-531
2016-12-16 22:03:56 +00:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Current Chunk for Entity and Block Entities, counts by entity type 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.
2018-07-04 07:55:24 +00:00
@@ -144,7 +144,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
Don't let FishingHooks use portals Closes GH-531
2016-12-16 22:03:56 +00:00
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
Optimize Hoppers - Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
2018-01-18 06:00:51 +00:00
index 339d1f1b1..7f011aef8 100644
Don't let FishingHooks use portals Closes GH-531
2016-12-16 22:03:56 +00:00
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
Update Paper to MC 1.11.1
2016-12-20 22:34:27 +00:00
@@ -185,6 +185,12 @@ public class EntityFishingHook extends Entity {
Don't let FishingHooks use portals Closes GH-531
2016-12-16 22:03:56 +00:00
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
}
}
--
Current Chunk for Entity and Block Entities, counts by entity type 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.
2018-07-04 07:55:24 +00:00
2.18.0
Don't let FishingHooks use portals Closes GH-531
2016-12-16 22:03:56 +00:00