36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
|
From 3fae37b400f05dba3d1ca15ad221ac4127ba2c20 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
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 f8be07258..633c75ffe 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/BlockChest.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/BlockChest.java
|
||
|
|
@@ -196,7 +196,12 @@ public class BlockChest extends BlockTileEntity implements IFluidSource, IFluidC
|
||
|
|
return (ITileInventory) object;
|
||
|
|
} else {
|
||
|
|
BlockPosition blockposition1 = blockposition.shift(j(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.18.0
|
||
|
|
|