geforkt von Mirrors/Paper
de04cbced5
Upstream has released updates that appear 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: f29cb801 Separate checkstyle-suppressions file is not required 86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack 9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode() 994a6163 Attempt upgrade of resolver libraries CraftBukkit Changes: b3b43a6ad Add Checkstyle check for unused imports 13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names 3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API 2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor 1dbdbbed4 PR-1238: Remove unnecessary sign ticking 659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper e37e29ce0 Increase outdated build delay c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack 492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode() e11fbb9d7 Upgrade MySQL driver 9f3a0bd2a Attempt upgrade of resolver libraries 60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion Spigot Changes: 06d602e7 Rebuild patches
33 Zeilen
1.9 KiB
Diff
33 Zeilen
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 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/world/level/block/DoubleBlockCombiner.java b/src/main/java/net/minecraft/world/level/block/DoubleBlockCombiner.java
|
|
index 0a40d9b7e394fa10d6bfb0057440e1b0e55d1fc4..67da7795caebc882f14814217efccd139fc8f1e3 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/DoubleBlockCombiner.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/DoubleBlockCombiner.java
|
|
@@ -25,7 +25,12 @@ public class DoubleBlockCombiner {
|
|
return new DoubleBlockCombiner.NeighborCombineResult.Single<>(blockEntity);
|
|
} else {
|
|
BlockPos blockPos = pos.relative(directionMapper.apply(state));
|
|
- BlockState blockState = world.getBlockState(blockPos);
|
|
+ // Paper start
|
|
+ BlockState blockState = world.getBlockStateIfLoaded(blockPos);
|
|
+ if (blockState == null) {
|
|
+ return new DoubleBlockCombiner.NeighborCombineResult.Single<>(blockEntity);
|
|
+ }
|
|
+ // Paper end
|
|
if (blockState.is(state.getBlock())) {
|
|
DoubleBlockCombiner.BlockType blockType2 = typeMapper.apply(blockState);
|
|
if (blockType2 != DoubleBlockCombiner.BlockType.SINGLE && blockType != blockType2 && blockState.getValue(directionProperty) == state.getValue(directionProperty)) {
|