geforkt von Mirrors/Paper
5c7081fecc
* 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
33 Zeilen
1.9 KiB
Diff
33 Zeilen
1.9 KiB
Diff
From 67059dc9aad32e8a6c2ba0337fcd54bac50e8f36 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 10 Mar 2018 16:33:15 -0500
|
|
Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
|
|
index 39c3bbc9cf..881dfb1235 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockIceFrost.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
|
|
@@ -26,7 +26,8 @@ public class BlockIceFrost extends BlockIce {
|
|
EnumDirection enumdirection = aenumdirection[j];
|
|
|
|
blockposition_pooledblockposition.g(blockposition).c(enumdirection);
|
|
- IBlockData iblockdata1 = world.getType(blockposition_pooledblockposition);
|
|
+ IBlockData iblockdata1 = world.getTypeIfLoaded(blockposition_pooledblockposition); // Paper - don't load chunks
|
|
+ if (iblockdata1 == null) continue; // Paper
|
|
|
|
if (iblockdata1.getBlock() == this && !this.e(iblockdata1, world, blockposition_pooledblockposition)) {
|
|
world.getBlockTickList().a(blockposition_pooledblockposition, this, MathHelper.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
|
|
@@ -89,7 +90,7 @@ public class BlockIceFrost extends BlockIce {
|
|
EnumDirection enumdirection = aenumdirection[l];
|
|
|
|
blockposition_pooledblockposition.g(blockposition).c(enumdirection);
|
|
- if (iblockaccess.getType(blockposition_pooledblockposition).getBlock() == this) {
|
|
+ if (((World) iblockaccess).getBlockIfLoaded(blockposition_pooledblockposition) == this) { // Paper - don't load chunks
|
|
++j;
|
|
if (j >= i) {
|
|
boolean flag = false;
|
|
--
|
|
2.21.0
|
|
|