Updated Upstream (Tuinity)

Upstream has released updates that appear to apply and compile correctly

Tuinity Changes:
36c99d9f1 Starlight: Custom block emittence handlers & improve relighting
This commit is contained in:
jmp
2020-12-31 23:25:28 -08:00
parent 7194a1684a
commit da957253a3
9 changed files with 508 additions and 114 deletions

View File

@@ -18,7 +18,7 @@ index 88c3d7efaf467c1c1487f589c2cdbfb6aba734ec..fed1ce95038ead72a663f5a562dd4628
public PacketPlayOutUpdateTime() {}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 9eceeb44b19533d80f591850ab496b24b3605a4b..0789281a18fd9dc8aab2def638f45510dc29dabc 100644
index 78259bbb90fbd46bfd7922b9844339ff0a4c0342..98d7686b15bbd5f75676e4391a241d5955f1c5e5 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 9eceeb44b19533d80f591850ab496b24b3605a4b..0789281a18fd9dc8aab2def638f45510
// CraftBukkit start
@@ -381,6 +382,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -388,6 +389,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 9eceeb44b19533d80f591850ab496b24b3605a4b..0789281a18fd9dc8aab2def638f45510
}
// Tuinity start - optimise collision
@@ -957,7 +959,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -964,7 +966,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 9eceeb44b19533d80f591850ab496b24b3605a4b..0789281a18fd9dc8aab2def638f45510
this.setDayTime(this.worldData.getDayTime() + 1L);
}
@@ -966,6 +982,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -973,6 +989,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
public void setDayTime(long i) {
this.worldDataServer.setDayTime(i);