Updated Upstream (Tuinity)

Upstream has released updates that appears to apply and compile correctly
Tuinity Changes:
12efad6 Prevent log spam for "Block is water but TE is chest"
6d4fc1f Prevent unload() calls removing tickets for sync loads
f9de229 Allow entities to be removed during entity tick
ca376d1 Make sure flush consolidation works
16b65f0 Make setting of TE less hacky
7c03cbe Rebuild patches
da09c8c Merge branch 'master' of github.com:Spottedleaf/Tuinity
7ed0891 Remove an unused patch (#133)
fc37bbd Remove allocation of Long by the light engine
1bb0c6a Updated Upstream (Paper)
eb0ca1a Ensure pistons moving signs drops signs items if they can't be placed
35bd141 Add the option to allow pistons to push tile entities
f355806 Fix incorrect async future completion by worldgen thread
2051fe3 Revert frustrum priority in ChunkMapDistance
7e7af54 Updated Upstream (Paper)
8c4edd5 Prevent getChunkAt from retaining chunks for long periods of time
42ce364 Updated Upstream (Paper)
391273f Fix newer jdk compile
This commit is contained in:
ㄗㄠˋ ㄑㄧˊ
2020-06-19 19:40:28 +08:00
parent 9c56ced43e
commit 518c6e1ce6
9 changed files with 81 additions and 81 deletions

View File

@@ -39,10 +39,10 @@ index a0450a7ddf21659c5636b3f298e6bf4f0a93fc4d..c4227ff056f906c6ea1fec0330d2db84
public int compareTo(BaseBlockPosition baseblockposition) {
return this.getY() == baseblockposition.getY() ? (this.getZ() == baseblockposition.getZ() ? this.getX() - baseblockposition.getX() : this.getZ() - baseblockposition.getZ()) : this.getY() - baseblockposition.getY();
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 3bf17ccdaef21322b787db538d569e0bc614ef22..349cd6b2b11f1ff28cfa5504cd14fe23583d4b56 100644
index 4c64798fbc50f4d8b08502ba865c5fde5c968e62..ba6d9c838bf7cd16ad300029521f089d48f19547 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -441,6 +441,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -437,6 +437,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
this.y = j;
this.z = k;
// Paper end
@@ -50,7 +50,7 @@ index 3bf17ccdaef21322b787db538d569e0bc614ef22..349cd6b2b11f1ff28cfa5504cd14fe23
return this;
}
@@ -481,16 +482,19 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -477,16 +478,19 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
public final void setX(final int x) { this.o(x); } // Paper - OBFHELPER
public void o(int i) {
this.x = i; // Paper change to x