Updated Upstream (Tuinity)

Upstream has released updates that appears to apply and compile correctly Tuinity Changes: f4d4a4a Fixes for light engine a2faf7b Merge branch 'master' into dev/lighting ed9e0c4 Fix worldborder checks for getCubes
TECHNOVE · Nov 23, 2020 · fd35d6a · fd35d6a
1 parent 4e58d46
commit fd35d6a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Tuinity b/Tuinity
diff --git a/patches/server/0006-Queue-lighting-update-only-once.patch b/patches/server/0006-Queue-lighting-update-only-once.patch
@@ -34,7 +34,7 @@ index 84429f12d0c6e0990b7cbb1b503b7868b3a02b14..e4c2bcc2b14ef3a5fb35fa6131ed2248
              this.world.getMethodProfiler().enter("customSpawners");
              if (flag1) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0ac1bd39ae80325f2528eda0f27f995b50a254b4..2eaa70ae29dbc1b8b5aa8dec5ff3a911680d047f 100644
+index 349bc2d629b3238589e8f92b8855c86df7b33ca4..3bbeb39c4859f9399887d97cf550bc65133a3dfc 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1031,7 +1031,10 @@ public class WorldServer extends World implements GeneratorAccessSeed {

diff --git a/patches/server/0011-Swap-priority-of-checks-in-chunk-ticking.patch b/patches/server/0011-Swap-priority-of-checks-in-chunk-ticking.patch
@@ -7,7 +7,7 @@ World.V showed up a lot in lag spikes for some reason, although I wonder
 if it's just Spark getting JVM safe points.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2eaa70ae29dbc1b8b5aa8dec5ff3a911680d047f..874cccba2b4ab895858b56a51adeebe7d644e0ca 100644
+index 3bbeb39c4859f9399887d97cf550bc65133a3dfc..2342cde66a2afefbdb520d08786a269fed58ffcd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1044,7 +1044,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {