diff --git a/Origami b/Origami index 3080db6c..6c89f23c 160000 --- a/Origami +++ b/Origami @@ -1 +1 @@ -Subproject commit 3080db6c116f21e757555ff526ba4c677269177d +Subproject commit 6c89f23c1ab78c8fd3a370178a03e8b64fc0d1d0 diff --git a/Purpur b/Purpur index d4301d4a..242deeef 160000 --- a/Purpur +++ b/Purpur @@ -1 +1 @@ -Subproject commit d4301d4a64847788e7d936fecd4dcf31f57ea330 +Subproject commit 242deeef8271d2ee02429eed461aec76f8af7a56 diff --git a/Tuinity b/Tuinity index c9cfdba3..d39cda09 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit c9cfdba355539bad68508c4aed98bf5b3d8e0dec +Subproject commit d39cda09e5f32f4831a381c401fea0e6099c396f diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch index 057cc23e..b8092dbe 100644 --- a/patches/server/0001-Yatopia-Server-Fixes.patch +++ b/patches/server/0001-Yatopia-Server-Fixes.patch @@ -2483,7 +2483,7 @@ index 3a35169eaf680c45fe42922eb5f0014fa422c31c..00000000000000000000000000000000 - } - // Spigot Start diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 1b35065484833af89b43b28c9db3557ccdf1e1b3..6052ef1d4ede54cf23aa854298cbcd4f7e8ce9cf 100644 +index d70ce418a81de3a863c79e3f70737e80216bc95d..41e218f31d5d384d836fe03c474121e7a8e70e82 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -869,11 +869,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0028-Optimize-player-loops-around-weather.patch b/patches/server/0028-Optimize-player-loops-around-weather.patch index 426e588d..c1ec11db 100644 --- a/patches/server/0028-Optimize-player-loops-around-weather.patch +++ b/patches/server/0028-Optimize-player-loops-around-weather.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize player loops around weather diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6052ef1d4ede54cf23aa854298cbcd4f7e8ce9cf..c1f433bc287f0dc36d09194f3535aee5cf2d72cf 100644 +index 41e218f31d5d384d836fe03c474121e7a8e70e82..4a31b93fcfefb44904fde0720953dcf995f6e5fb 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -814,12 +814,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0034-lithium-collision-optimizations.patch b/patches/server/0034-lithium-collision-optimizations.patch index 83026df5..9e5f05e6 100644 --- a/patches/server/0034-lithium-collision-optimizations.patch +++ b/patches/server/0034-lithium-collision-optimizations.patch @@ -1023,7 +1023,7 @@ index 8fd74f076713fa3ec289ee69d4d9a78f10139f8e..15df27eabfee965e6fd63ad74e5be9a9 sum += size; } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c1f433bc287f0dc36d09194f3535aee5cf2d72cf..ce0ecfc0dc2986ab686dc3e474c4f5a25bb2bee1 100644 +index 4a31b93fcfefb44904fde0720953dcf995f6e5fb..2ff11785fec05b7049d9bd76f54628f362beb35c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -649,8 +649,14 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -1041,7 +1041,7 @@ index c1f433bc287f0dc36d09194f3535aee5cf2d72cf..ce0ecfc0dc2986ab686dc3e474c4f5a2 } @Override -@@ -1765,12 +1771,12 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1772,12 +1778,12 @@ public class WorldServer extends World implements GeneratorAccessSeed { } // Spigot End this.tileEntityListUnload.addAll(chunk.getTileEntities().values()); diff --git a/patches/server/0038-Load-also-the-chunk-that-you-re-teleporting-to.patch b/patches/server/0038-Load-also-the-chunk-that-you-re-teleporting-to.patch index 8858b47e..93dcf971 100644 --- a/patches/server/0038-Load-also-the-chunk-that-you-re-teleporting-to.patch +++ b/patches/server/0038-Load-also-the-chunk-that-you-re-teleporting-to.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Load also the chunk that you're teleporting to Fixes Tuinity-178 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ce0ecfc0dc2986ab686dc3e474c4f5a25bb2bee1..82a98a60d3ca06533fa3e6db53394fe6c6c77cb8 100644 +index 2ff11785fec05b7049d9bd76f54628f362beb35c..56d97496807373b00d8f213a1aa0f96f14dc4058 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -225,7 +225,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0046-Fix-LightEngineThreaded-memory-leak.patch b/patches/server/0046-Fix-LightEngineThreaded-memory-leak.patch index 7c3338fe..b7e3c56d 100644 --- a/patches/server/0046-Fix-LightEngineThreaded-memory-leak.patch +++ b/patches/server/0046-Fix-LightEngineThreaded-memory-leak.patch @@ -18,10 +18,10 @@ index ceaa92400678aef3bf436279dd807e4b38609dda..d9bbac17c5767df638fc4464e9795d5c return this.size == 0 && this.pendingTasks.isEmpty(); } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 82a98a60d3ca06533fa3e6db53394fe6c6c77cb8..fd8aacc3a158093e524d2bc552a3c2fdc9135ecf 100644 +index 56d97496807373b00d8f213a1aa0f96f14dc4058..61aaa916b1a0e0ce9898b26381f4f22669730f57 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1808,6 +1808,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1815,6 +1815,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { } // Paper end