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

@@ -193,10 +193,10 @@ index 37e9b8983fc310a04c98e27048b119439179cb5f..d42dbc3b44f8b54b05f356155727f5a8
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8d8385e3022dd84e2b92daeffa190dbda60c705b..04241410edd97bdce876a61052bd94189168d367 100644
index ff1d80c7c3271a18fa355430417dd1992b8494a8..9d4181179760140c88cda25f8082d9b682814772 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -774,7 +774,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -781,7 +781,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
// CraftBukkit end
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -205,7 +205,7 @@ index 8d8385e3022dd84e2b92daeffa190dbda60c705b..04241410edd97bdce876a61052bd9418
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -1111,7 +1111,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1118,7 +1118,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();