From a91c1c2d1807e4f57ddc251f4457a3b2adca77fb 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 --- .../level/block/DoubleBlockCombiner.java.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 paper-server/patches/sources/net/minecraft/world/level/block/DoubleBlockCombiner.java.patch diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/DoubleBlockCombiner.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/DoubleBlockCombiner.java.patch new file mode 100644 index 000000000..657fe3fb5 --- /dev/null +++ b/paper-server/patches/sources/net/minecraft/world/level/block/DoubleBlockCombiner.java.patch @@ -0,0 +1,16 @@ +--- a/net/minecraft/world/level/block/DoubleBlockCombiner.java ++++ b/net/minecraft/world/level/block/DoubleBlockCombiner.java +@@ -34,7 +34,12 @@ + return new DoubleBlockCombiner.NeighborCombineResult.Single<>(blockEntity); + } else { + BlockPos blockPos = pos.relative(directionMapper.apply(state)); +- BlockState blockState = world.getBlockState(blockPos); ++ // Paper start - Don't load Chunks from Hoppers and other things ++ BlockState blockState = world.getBlockStateIfLoaded(blockPos); ++ if (blockState == null) { ++ return new DoubleBlockCombiner.NeighborCombineResult.Single<>(blockEntity); ++ } ++ // Paper end - Don't load Chunks from Hoppers and other things + if (blockState.is(state.getBlock())) { + DoubleBlockCombiner.BlockType blockType2 = typeMapper.apply(blockState); + if (blockType2 != DoubleBlockCombiner.BlockType.SINGLE