PaperMC/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch

From 7a9acb2b929b4ae045ccae931154e35470d8145d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 5 Jan 2020 17:24:34 -0600
Subject: [PATCH] Prevent bees loading chunks checking hive position


diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
index b39599654e3..73e01625784 100644
--- a/src/main/java/net/minecraft/server/EntityBee.java
+++ b/src/main/java/net/minecraft/server/EntityBee.java
@@ -386,6 +386,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
         if (!this.hasHivePos()) {
             return false;
         } else {
+            if (world.getChunkIfLoadedImmediately(hivePos.getX() >> 4, hivePos.getZ() >> 4) == null) return true; // Paper - just assume the hive is still there, no need to load the chunk(s)
             TileEntity tileentity = this.world.getTileEntity(this.hivePos);
 
             return tileentity != null && tileentity.getTileType() == TileEntityTypes.BEEHIVE;
-- 
2.26.2
Optimize Network Manager to not need synchronization Removes synchronization from sending packets Makes normal packet sends no longer need to be wrapped and queued like it use to work. Adds more packet queue immunities on top of keep alive to let the following scenarios go out without delay: - Keep Alive - Chat - Kick - All of the packets during the Player Joined World event Hoping that latter one helps join timeout issues more too for slow connections. Removes processing packet queue off of main thread - for the few cases where it is allowed, order is not necessary nor should it even be happening concurrently in first place (handshaking/login/status) Ensures packets sent asynchronously are dispatched on main thread This helps ensure safety for ProtocolLib as packet listeners are commonly accessing world state. This will allow you to schedule a packet to be sent async, but itll be dispatched sync for packet listeners to process. This should solve some deadlock risks This may provide a decent performance improvement because thread synchronization incurs a cache reset so by avoiding ever entering a synchronized block, we get to avoid that, and packet sending is a really hot activity. 2020-05-06 11:22:03 +02:00			`From 7a9acb2b929b4ae045ccae931154e35470d8145d Mon Sep 17 00:00:00 2001`
Prevent bees loading chunks checking hive position (#2828) 2020-01-10 02:28:29 +01:00			`From: William Blake Galbreath <Blake.Galbreath@GMail.com>`
			`Date: Sun, 5 Jan 2020 17:24:34 -0600`
			`Subject: [PATCH] Prevent bees loading chunks checking hive position`


			`diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java`
Optimize Network Manager to not need synchronization Removes synchronization from sending packets Makes normal packet sends no longer need to be wrapped and queued like it use to work. Adds more packet queue immunities on top of keep alive to let the following scenarios go out without delay: - Keep Alive - Chat - Kick - All of the packets during the Player Joined World event Hoping that latter one helps join timeout issues more too for slow connections. Removes processing packet queue off of main thread - for the few cases where it is allowed, order is not necessary nor should it even be happening concurrently in first place (handshaking/login/status) Ensures packets sent asynchronously are dispatched on main thread This helps ensure safety for ProtocolLib as packet listeners are commonly accessing world state. This will allow you to schedule a packet to be sent async, but itll be dispatched sync for packet listeners to process. This should solve some deadlock risks This may provide a decent performance improvement because thread synchronization incurs a cache reset so by avoiding ever entering a synchronized block, we get to avoid that, and packet sending is a really hot activity. 2020-05-06 11:22:03 +02:00			`index b39599654e3..73e01625784 100644`
Prevent bees loading chunks checking hive position (#2828) 2020-01-10 02:28:29 +01:00			`--- a/src/main/java/net/minecraft/server/EntityBee.java`
			`+++ b/src/main/java/net/minecraft/server/EntityBee.java`
			`@@ -386,6 +386,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {`
			`if (!this.hasHivePos()) {`
			`return false;`
			`} else {`
			`+ if (world.getChunkIfLoadedImmediately(hivePos.getX() >> 4, hivePos.getZ() >> 4) == null) return true; // Paper - just assume the hive is still there, no need to load the chunk(s)`
			`TileEntity tileentity = this.world.getTileEntity(this.hivePos);`

			`return tileentity != null && tileentity.getTileType() == TileEntityTypes.BEEHIVE;`
			`--`
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item 2020-05-02 00:03:47 +02:00			`2.26.2`
Prevent bees loading chunks checking hive position (#2828) 2020-01-10 02:28:29 +01:00