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

@@ -42,10 +42,10 @@ index bdfdb73bc1305d3fbda2e0ebe8163bf43b8aede5..ab97d076c921e1fd3ba69ed4b93d43e9
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c402803a364908b854efdb5777f355ac5fee51a4..9eceeb44b19533d80f591850ab496b24b3605a4b 100644
index d5f1808b232869ed5db8161345a03bf79fd159b7..78259bbb90fbd46bfd7922b9844339ff0a4c0342 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -332,7 +332,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -339,7 +339,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {
this.L = new ObjectLinkedOpenHashSet();
this.Q = flag1;
this.server = minecraftserver;