Updated Upstream (Tuinity)

Upstream has released updates that appear to apply and compile correctly

Tuinity Changes:
36c99d9f1 Starlight: Custom block emittence handlers & improve relighting

patches/server/0009-AFK-API.patch

@@ -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();
  

patches/server/0017-EntityMoveEvent.patch

@@ -42,7 +42,7 @@ index 5d8cf545acf231f8f9c037db26f4d29bc01efabb..fe3b76e4ed11f0183731a0dcc39a323c
  
              this.methodProfiler.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 04241410edd97bdce876a61052bd94189168d367..b36baf63f5981309020b3b24b907d097188b4487 100644
+index 9d4181179760140c88cda25f8082d9b682814772..fedf4d31eebc040e4c3970d5bc1c777726ad8e7a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -101,6 +101,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

patches/server/0029-Zombie-horse-naturally-spawn.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b36baf63f5981309020b3b24b907d097188b4487..f288bf3f6e521cfde14b08c62d591ad74d2e3153 100644
+index fedf4d31eebc040e4c3970d5bc1c777726ad8e7a..a4296f150d196b12a6e95730ac2b8c43412cc01a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -989,12 +989,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -996,12 +996,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
  
                  if (flag1) {

patches/server/0039-Cat-spawning-options.patch

@@ -95,10 +95,10 @@ index a5718af9b614ae505067131f04ebb490617d6aa4..b6b4c8c491d692f93d2c38d602ff99b0
          return this.E;
      }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f288bf3f6e521cfde14b08c62d591ad74d2e3153..93f09acd2ca26793bc0771a6cc5419bfa8536816 100644
+index a4296f150d196b12a6e95730ac2b8c43412cc01a..5db25b05565be541f07993092ba8e67c32d7cb18 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -2499,6 +2499,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -2506,6 +2506,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          }
      }
  

patches/server/0106-Add-no-tick-block-list.patch

@@ -22,10 +22,10 @@ index 829d4a7508e1656dbdc912096b7eafcf30cbb5b2..6aea156d7c7a9ca8a357aad6a6781d72
          }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 93f09acd2ca26793bc0771a6cc5419bfa8536816..d86fa84b48d2c2b3bf4619788bdc64d22212661d 100644
+index 5db25b05565be541f07993092ba8e67c32d7cb18..44942f73c98e28821ee9d899733f44f45762b02c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -314,14 +314,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -321,14 +321,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          // CraftBukkit end
          if (com.destroystokyo.paper.PaperConfig.useOptimizedTickList) {
              this.nextTickListBlock = new com.destroystokyo.paper.server.ticklist.PaperTickList<>(this, (block) -> {

patches/server/0110-Ridables.patch

@@ -5041,7 +5041,7 @@ index 7a82a894bb3f737cc80f0b4b8d7a1b25ce1afc6c..bdfdb73bc1305d3fbda2e0ebe8163bf4
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d86fa84b48d2c2b3bf4619788bdc64d22212661d..c402803a364908b854efdb5777f355ac5fee51a4 100644
+index 44942f73c98e28821ee9d899733f44f45762b02c..d5f1808b232869ed5db8161345a03bf79fd159b7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -102,6 +102,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

patches/server/0116-Allow-toggling-special-MobSpawners-per-world.patch

@@ -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;

patches/server/0126-Configurable-daylight-cycle.patch

@@ -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);