Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
079a793b Revert "Only consider chunks Loaded if at BORDER status"
eda80e3d Prevent fire from spreading to invalid locations

Tuinity Changes:
e0e7144 Aggressive state checking in region manager
ba4dbb6 Do not allow ticket level changes while unloading playerchunks
1e695f4 Make sure inlined getChunkAt has inlined logic for loaded chunks
This commit is contained in:
William Blake Galbreath
2020-09-22 11:05:07 -05:00
parent 8d407a93a1
commit 2cce22a913
6 changed files with 74 additions and 67 deletions

View File

@@ -233,10 +233,10 @@ index beaea041d..ce8834980 100644
return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata))));
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1f91d258b..8494fb60f 100644
index 856f422e5..63f2dee38 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1423,6 +1423,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1432,6 +1432,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
return new DifficultyDamageScaler(this.getDifficulty(), this.getDayTime(), i, f);
}