Updated Upstream (Tuinity)

Upstream has released updates that appear to apply and compile correctly

Tuinity Changes:
a539774b1 Fix off-by-one for BasicEntityList
0763cd19b Updated Upstream (Paper)
ad35543e7 Various optimisations
2006b9b83 Discord vanity URL
This commit is contained in:
jmp
2021-02-20 15:42:43 -08:00
parent 90f67f87de
commit c08f028635
19 changed files with 1020 additions and 388 deletions

View File

@@ -18,7 +18,7 @@ index 1b9b43ee696575d986c25cafec07d863acb951a7..e837db171545ceacbc84a2b360cf0d95
public PacketPlayOutUpdateTime() {}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 154f49b96e3622f803e9599116fd60c77dea90d1..a873d60875b2c08c8813cb365566e46ee99cb625 100644
index ae3ec2eca3130943536b80bd1296eba67aa08e3c..5d92398369862881d997c270671ddb6b78ed2cb4 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -94,6 +94,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -29,7 +29,7 @@ index 154f49b96e3622f803e9599116fd60c77dea90d1..a873d60875b2c08c8813cb365566e46e
// CraftBukkit start
@@ -388,6 +389,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -485,6 +486,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
this.getServer().addWorld(this.getWorld()); // CraftBukkit
this.asyncChunkTaskManager = new com.destroystokyo.paper.io.chunk.ChunkTaskManager(this); // Paper
@@ -37,7 +37,7 @@ index 154f49b96e3622f803e9599116fd60c77dea90d1..a873d60875b2c08c8813cb365566e46e
}
// Tuinity start - optimise collision
@@ -972,7 +974,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1069,7 +1071,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
this.nextTickListBlock.nextTick(); // Paper
this.nextTickListFluid.nextTick(); // Paper
this.worldDataServer.u().a(this.server, i);
@@ -60,7 +60,7 @@ index 154f49b96e3622f803e9599116fd60c77dea90d1..a873d60875b2c08c8813cb365566e46e
this.setDayTime(this.worldData.getDayTime() + 1L);
}
@@ -981,6 +997,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1078,6 +1094,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
public void setDayTime(long i) {
this.worldDataServer.setDayTime(i);