Updated Upstream (Tuinity)

Upstream has released updates that appear to apply and compile correctly Tuinity Changes: 09997a6 Merge branch 'master' into dev/lighting 8954b61 Updated Upstream (Paper)
TECHNOVE · Jan 9, 2021 · 36cc1d3 · 36cc1d3
1 parent bc0fef0
commit 36cc1d3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 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
@@ -49,7 +49,7 @@ index 12d9b73ccc2f4406957932397746cac7902d650e..fc9919dd01cad02486af293f9b0c6920
              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 ff1d80c7c3271a18fa355430417dd1992b8494a8..4dc1f0dc5b847f541ccd889618fb41fee61cad89 100644
+index 72452abfe1fa8eafac386e0f2e5d87296772675a..bf1502c8e9277b533933b43a453b98c3b09b7849 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -978,7 +978,10 @@ public class WorldServer extends World implements GeneratorAccessSeed {

diff --git a/patches/server/0010-Swap-priority-of-checks-in-chunk-ticking.patch b/patches/server/0010-Swap-priority-of-checks-in-chunk-ticking.patch
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4dc1f0dc5b847f541ccd889618fb41fee61cad89..460f9a17bf1ced7cd542ab2f226bba1f9d408329 100644
+index bf1502c8e9277b533933b43a453b98c3b09b7849..487b7ffcc6653be9494a130729fda5f368345bd5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -991,7 +991,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

diff --git a/patches/server/0013-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0013-Optimize-random-calls-in-chunk-ticking.patch
@@ -68,7 +68,7 @@ index 83e3dcbbe36ce1f947f387ec55067e51a1b7384a..41d20589cca42b74816a5801463ccec8
              boolean flag2 = world.ticksPerAnimalSpawns != 0L && worlddata.getTime() % world.ticksPerAnimalSpawns == 0L; // CraftBukkit
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 460f9a17bf1ced7cd542ab2f226bba1f9d408329..94bee5561e4384ce6a667ac2945f26406220d97a 100644
+index 487b7ffcc6653be9494a130729fda5f368345bd5..edad2f05b93872473e965f5285f63214f56ced52 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -978,6 +978,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {