Updated Upstream (Paper, Tuinity, & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
3dcbdc73b Fix force upgrade patch (#5699)
dab6ec6cd List all missing hard depends not just first (#5673)
aed5031e3 Fix/Optimize world and light datafixes (#5693)
719040d92 [Auto] Updated Upstream (CraftBukkit)
6c183f1ae [Auto] Updated Upstream (CraftBukkit)

Tuinity Changes:
f88659c8e Fix and optimise world force upgrading

Airplane Changes:
7f3b09178 Move check
040fa19eb Better checking for useless move packets
5fab6a257 Improvements to fluid & profiler patches
046ae543c Improve hopper performance via bitset
4a221843f Update Upstream (Tuinity)
This commit is contained in:
BillyGalbreath
2021-05-21 04:25:41 -05:00
parent 1808888a40
commit af2dd61af0
25 changed files with 735 additions and 207 deletions

View File

@@ -18,7 +18,7 @@ index 3086ee023685781d94e2fb99fc8dff5264f01165..74c1047305cac5673e274096709c757e
public PacketPlayOutUpdateTime() {}
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 48ec845fbe34367a40fdd7e601e093054b82a345..590481914415374e2eb8b6b92d1469e7146620c3 100644
index 8bf5d370fc9e9e7ad678c49057f2ad0009a6379b..56839f31bedd8efb5196325b7b31f0365844675f 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -64,6 +64,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutExplosion;
@@ -45,7 +45,7 @@ index 48ec845fbe34367a40fdd7e601e093054b82a345..590481914415374e2eb8b6b92d1469e7
}
// Tuinity start - optimise collision
@@ -1211,7 +1214,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1227,7 +1230,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
this.nextTickListBlock.nextTick(); // Paper
this.nextTickListFluid.nextTick(); // Paper
this.worldDataServer.u().a(this.server, i);
@@ -68,7 +68,7 @@ index 48ec845fbe34367a40fdd7e601e093054b82a345..590481914415374e2eb8b6b92d1469e7
this.setDayTime(this.worldData.getDayTime() + 1L);
}
@@ -1220,6 +1237,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1236,6 +1253,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
public void setDayTime(long i) {
this.worldDataServer.setDayTime(i);