From fb25dc17c62acce335346d5e96899257ae7230c7 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 22 Apr 2019 22:36:14 +0100 Subject: 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: da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 0cef14e4 Remove draft API from selectEntities CraftBukkit Changes: a46fdbc6 Remove outdated build delay. 3697519b SPIGOT-4708: Fix ExactChoice recipes neglecting material 9ead7009 SPIGOT-4677: Add minecraft.admin.command_feedback permission c3749a23 Remove the Damage tag from items when it is 0. f74c7b95 SPIGOT-4706: Can't interact with active item 494eef45 Mention requirement of JIRA ticket for bug fixes 51d62dec SPIGOT-4702: Exception when middle clicking certain slots be557e69 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN --- ...load-Chunks-from-Hoppers-and-other-things.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Spigot-Server-Patches/0141-Don-t-load-Chunks-from-Hoppers-and-other-things.patch (limited to 'Spigot-Server-Patches/0141-Don-t-load-Chunks-from-Hoppers-and-other-things.patch') diff --git a/Spigot-Server-Patches/0141-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0141-Don-t-load-Chunks-from-Hoppers-and-other-things.patch new file mode 100644 index 0000000000..bec415521b --- /dev/null +++ b/Spigot-Server-Patches/0141-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -0,0 +1,35 @@ +From 12c6e1557233d240f7f5ef44e6b5dcd93c19c097 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Thu, 3 Nov 2016 20:28:12 -0400 +Subject: [PATCH] Don't load Chunks from Hoppers and other things + +Hoppers call this to I guess "get the primary side" of a double sided chest. + +If the double sided chest crosses chunk lines, it causes the chunk to load. +This will end up causing sync chunk loads, which will unload with Chunk GC, +only to be reloaded again the next tick. + +This of course is undesirable, so just return the loaded side as "primary" +and treat it as a single chest if the other sides are unloaded + +diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java +index e94786138e..c61721bc3d 100644 +--- a/src/main/java/net/minecraft/server/BlockChest.java ++++ b/src/main/java/net/minecraft/server/BlockChest.java +@@ -193,7 +193,12 @@ public class BlockChest extends BlockTileEntity implements IFluidSource, IFluidC + return (ITileInventory) object; + } else { + BlockPosition blockposition1 = blockposition.shift(k(iblockdata)); +- IBlockData iblockdata1 = world.getType(blockposition1); ++ // Paper start - don't load chunks if the other side of the chest is in unloaded chunk ++ final IBlockData iblockdata1 = world.getTypeIfLoaded(blockposition1); // Paper ++ if (iblockdata1 == null) { ++ return null; ++ } ++ // Paper end + + if (iblockdata1.getBlock() == this) { + BlockPropertyChestType blockpropertychesttype1 = (BlockPropertyChestType) iblockdata1.get(BlockChest.b); +-- +2.21.0 + -- cgit v1.2.3