diff --git a/Purpur b/Purpur index 4a9c0163..475b2325 160000 --- a/Purpur +++ b/Purpur @@ -1 +1 @@ -Subproject commit 4a9c0163d9d5048f14c74d24a0d5e73fdaebb1f6 +Subproject commit 475b2325618cf556c8d0184090e3ea31a8f3bcb5 diff --git a/Tuinity b/Tuinity index e76c58ef..683b9139 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit e76c58ef41cbc3df4296c367eb1ee302aa1e21ee +Subproject commit 683b91397dd2c2cdc8164b0f2a26e1d8963268ce diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch index 51b45ab0..dfaa5ae6 100644 --- a/patches/server/0001-Yatopia-Server-Fixes.patch +++ b/patches/server/0001-Yatopia-Server-Fixes.patch @@ -142,14 +142,13 @@ index 2291135eaef64c403183724cb6e413cd7e472672..6fcc7ed7c129e6a33386d65b37cbba4a public static long a(long i, EnumDirection enumdirection) { return a(i, enumdirection.getAdjacentX(), enumdirection.getAdjacentY(), enumdirection.getAdjacentZ()); diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 781d74cf7e3669d71727cce781a8f8ce088c5547..bb7170e4f82f2f0d0046ceed95ac6a2622b9852f 100644 +index 781d74cf7e3669d71727cce781a8f8ce088c5547..7a25349d59d454c43453726f6f44b16a3e90e681 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -52,6 +52,17 @@ public class Chunk implements IChunkAccess { - private Consumer v; +@@ -53,6 +53,17 @@ public class Chunk implements IChunkAccess { private final ChunkCoordIntPair loc; public final long coordinateKey; public final int locX; public final int locZ; // Paper - cache coordinate key private volatile boolean x; -+ + + // AirplaneL start - instead of using a random every time the chunk is ticked, define when lightning strikes preemptively + private int lightningTick = -1; + public boolean shouldDoLightning() { @@ -160,9 +159,10 @@ index 781d74cf7e3669d71727cce781a8f8ce088c5547..bb7170e4f82f2f0d0046ceed95ac6a26 + return doTick; + } + // AirplaneL end - ++ public Chunk(World world, ChunkCoordIntPair chunkcoordintpair, BiomeStorage biomestorage) { this(world, chunkcoordintpair, biomestorage, ChunkConverter.a, TickListEmpty.b(), TickListEmpty.b(), 0L, (ChunkSection[]) null, (Consumer) null); + } diff --git a/src/main/java/net/minecraft/server/Chunk.java.rej b/src/main/java/net/minecraft/server/Chunk.java.rej deleted file mode 100644 index 6a63cbff4fcd1ebcc23910a8ae4f400df0e51351..0000000000000000000000000000000000000000 @@ -244,7 +244,7 @@ index 86f1cfe454ea0a989775b49a6b88375c766ef647..da53af61d1171db3c167c6e007adf953 if (!(this.k instanceof EntityPlayer)) { throw CommandListenerWrapper.a.create(); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 77100ab382b33aef8b2194b611c0b1d454da91fd..1ece3e1e9e7a26f1ee07202916687f627c9e4c95 100644 +index 59caf8aff5e4735b59d6b826a364f77889f9ce06..e809f24a62bd554bda93b8fc1fa79a6f28307364 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -434,7 +434,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -513,7 +513,7 @@ index 39dce006ebf2bd81a9d6c62c25eb9bd55d24199e..00000000000000000000000000000000 - } - // Spigot Start diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5ee0f3680b191e8522b07b522d073f804f2bf43e..a5eebf136e26e8c0b0b1f52e31793f1f11f27fe5 100644 +index 15ea85f42fbda6e2d25bd15009156b21571fa513..14f206d1bae202e26fd9c5ea0b9e3ff2a686c12e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -181,6 +181,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0011-Modify-default-configs.patch b/patches/server/0011-Modify-default-configs.patch index a2e0f278..ca4cd5aa 100644 --- a/patches/server/0011-Modify-default-configs.patch +++ b/patches/server/0011-Modify-default-configs.patch @@ -18,10 +18,10 @@ index ce14283dd1a1fddbea17c2fbaf1c4ef9d7a7479f..4a21a83c448355d61fb946bd0eb5d752 TimingsManager.privacy = getBoolean("timings.server-name-privacy", false); TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses", "settings.velocity-support.secret")); diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 5b2077c90e2a3010a6a596d7e3551e791e670d16..fd0f3d6ddea9d0a6f3fd3bba041d5ed60bddb13c 100644 +index 0ba5734e60467e34c73d4ed92f5a030af9817582..cbbe6349d9c1cb662a0891cf4eeb2556ff6a5294 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -624,7 +624,7 @@ public class PaperWorldConfig { +@@ -626,7 +626,7 @@ public class PaperWorldConfig { } public boolean cooldownHopperWhenFull = true; diff --git a/patches/server/0025-Fix-lead-fall-dmg-config.patch b/patches/server/0025-Fix-lead-fall-dmg-config.patch index f2c84219..459010aa 100644 --- a/patches/server/0025-Fix-lead-fall-dmg-config.patch +++ b/patches/server/0025-Fix-lead-fall-dmg-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix lead fall dmg config diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1ece3e1e9e7a26f1ee07202916687f627c9e4c95..540bd5ccb01789d9130ea64a78dc125f94f94bb6 100644 +index e809f24a62bd554bda93b8fc1fa79a6f28307364..a141f8d201f7512f9a3d43217cec5edc775196b1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1301,6 +1301,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0026-Optimize-some-stuff-in-WorldServer-ticking.patch b/patches/server/0026-Optimize-some-stuff-in-WorldServer-ticking.patch index 22e84005..96650cb8 100644 --- a/patches/server/0026-Optimize-some-stuff-in-WorldServer-ticking.patch +++ b/patches/server/0026-Optimize-some-stuff-in-WorldServer-ticking.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize some stuff in WorldServer ticking Replaced some streams and some array lists with glue lists diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a5eebf136e26e8c0b0b1f52e31793f1f11f27fe5..01a9f85e84cd581a1a2c28e2b96dd6c1e6a3ba6b 100644 +index 14f206d1bae202e26fd9c5ea0b9e3ff2a686c12e..ab7200f6febabce80239f88c9e1732b42ae53f1f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -961,12 +961,21 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0036-Fix-LightEngineThreaded-memory-leak.patch b/patches/server/0036-Fix-LightEngineThreaded-memory-leak.patch index fa1bf982..3c39cb11 100644 --- a/patches/server/0036-Fix-LightEngineThreaded-memory-leak.patch +++ b/patches/server/0036-Fix-LightEngineThreaded-memory-leak.patch @@ -18,7 +18,7 @@ index 2f9c97dd4e1d705a87772d18c7ab4883a876af08..f3494ac1ad659352ca5595adf9e6919b 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 01a9f85e84cd581a1a2c28e2b96dd6c1e6a3ba6b..8665081d5e545fcd43350b8f487721e05cf81aed 100644 +index ab7200f6febabce80239f88c9e1732b42ae53f1f..3d1790125f9759c79856f62b24b8ed0f48c9e7aa 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1906,6 +1906,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {