From f7be0fd933ec9f61f967f9b02e02648770e690f4 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Sat, 11 Oct 2025 23:20:49 +0300 Subject: [PATCH] rearrange patches --- ...ed.patch => 0041-Implement-Secure-Seed.patch} | 2 +- .../0042-Dynamic-Activation-of-Brain.patch | 4 ++-- ....patch => 0043-Petal-Async-Pathfinding.patch} | 0 ...ch => 0044-Petal-Multithreaded-Tracker.patch} | 0 ... 0045-Pufferfish-Optimize-mob-spawning.patch} | 0 ...pler-ShapelessRecipes-comparison-for-V.patch} | 0 ...bs.patch => 0048-Clump-experience-orbs.patch} | 0 ...49-SparklyPaper-Parallel-world-ticking.patch} | 0 ...h => 0050-MSPT-Tracking-for-each-world.patch} | 2 +- ...patch => 0051-Catch-update-suppressors.patch} | 4 ++-- ...patch => 0052-Regionized-Chunk-Ticking.patch} | 8 ++++---- ...che.patch => 0053-C2ME-Limit-NBT-cache.patch} | 0 ...4-C2ME-Optimize-Aquifer-and-Beardifier.patch} | 0 ...ay.patch => 0055-Copper-Bulb-1gt-delay.patch} | 0 ...-delay.patch => 0056-Crafter-1gt-delay.patch} | 0 ....patch => 0057-Raytrace-Entity-Tracker.patch} | 4 ++-- ...ore.patch => 0058-Leaves-Protocol-Core.patch} | 10 +++++----- ...r-PR-Optimise-non-flush-packet-sending.patch} | 2 +- ...atch => 0060-Linear-region-file-format.patch} | 2 +- ...h => 0061-Cleanup-dead-code-from-Paper.patch} | 16 ++++++++-------- ...patch => 0062-C2ME-The-End-Biome-Cache.patch} | 0 ...0063-Euclidean-distance-squared-option.patch} | 0 ...64-Do-not-send-spectator-change-packet.patch} | 10 +++++----- ...ServerListPingEvent-for-secondary-motd.patch} | 2 +- ...nfigurable-player-spawn-tracking-range.patch} | 0 ...ons.patch => 0067-Optimize-collections.patch} | 2 +- ...onrise.patch => 0069-Optimize-Moonrise.patch} | 0 ...0070-lithium-combined_heightmap_update.patch} | 0 28 files changed, 34 insertions(+), 34 deletions(-) rename divinemc-server/minecraft-patches/features/{0043-Implement-Secure-Seed.patch => 0041-Implement-Secure-Seed.patch} (99%) rename divinemc-server/minecraft-patches/features/{0045-Petal-Async-Pathfinding.patch => 0043-Petal-Async-Pathfinding.patch} (100%) rename divinemc-server/minecraft-patches/features/{0049-Petal-Multithreaded-Tracker.patch => 0044-Petal-Multithreaded-Tracker.patch} (100%) rename divinemc-server/minecraft-patches/features/{0046-Pufferfish-Optimize-mob-spawning.patch => 0045-Pufferfish-Optimize-mob-spawning.patch} (100%) rename divinemc-server/minecraft-patches/features/{0057-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch => 0046-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch} (100%) rename divinemc-server/minecraft-patches/features/{0041-Clump-experience-orbs.patch => 0048-Clump-experience-orbs.patch} (100%) rename divinemc-server/minecraft-patches/features/{0051-SparklyPaper-Parallel-world-ticking.patch => 0049-SparklyPaper-Parallel-world-ticking.patch} (100%) rename divinemc-server/minecraft-patches/features/{0053-MSPT-Tracking-for-each-world.patch => 0050-MSPT-Tracking-for-each-world.patch} (95%) rename divinemc-server/minecraft-patches/features/{0056-Catch-update-suppressors.patch => 0051-Catch-update-suppressors.patch} (96%) rename divinemc-server/minecraft-patches/features/{0054-Regionized-Chunk-Ticking.patch => 0052-Regionized-Chunk-Ticking.patch} (98%) rename divinemc-server/minecraft-patches/features/{0044-C2ME-Limit-NBT-cache.patch => 0053-C2ME-Limit-NBT-cache.patch} (100%) rename divinemc-server/minecraft-patches/features/{0055-C2ME-Optimize-Aquifer-and-Beardifier.patch => 0054-C2ME-Optimize-Aquifer-and-Beardifier.patch} (100%) rename divinemc-server/minecraft-patches/features/{0048-Copper-Bulb-1gt-delay.patch => 0055-Copper-Bulb-1gt-delay.patch} (100%) rename divinemc-server/minecraft-patches/features/{0050-Crafter-1gt-delay.patch => 0056-Crafter-1gt-delay.patch} (100%) rename divinemc-server/minecraft-patches/features/{0061-Raytrace-Entity-Tracker.patch => 0057-Raytrace-Entity-Tracker.patch} (97%) rename divinemc-server/minecraft-patches/features/{0065-Leaves-Protocol-Core.patch => 0058-Leaves-Protocol-Core.patch} (95%) rename divinemc-server/minecraft-patches/features/{0067-Paper-PR-Optimise-non-flush-packet-sending.patch => 0059-Paper-PR-Optimise-non-flush-packet-sending.patch} (96%) rename divinemc-server/minecraft-patches/features/{0064-Linear-region-file-format.patch => 0060-Linear-region-file-format.patch} (99%) rename divinemc-server/minecraft-patches/features/{0052-Cleanup-dead-code-from-Paper.patch => 0061-Cleanup-dead-code-from-Paper.patch} (92%) rename divinemc-server/minecraft-patches/features/{0058-C2ME-The-End-Biome-Cache.patch => 0062-C2ME-The-End-Biome-Cache.patch} (100%) rename divinemc-server/minecraft-patches/features/{0059-Euclidean-distance-squared-option.patch => 0063-Euclidean-distance-squared-option.patch} (100%) rename divinemc-server/minecraft-patches/features/{0060-Do-not-send-spectator-change-packet.patch => 0064-Do-not-send-spectator-change-packet.patch} (95%) rename divinemc-server/minecraft-patches/features/{0062-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch => 0065-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch} (95%) rename divinemc-server/minecraft-patches/features/{0063-Configurable-player-spawn-tracking-range.patch => 0066-Configurable-player-spawn-tracking-range.patch} (100%) rename divinemc-server/minecraft-patches/features/{0066-Optimize-collections.patch => 0067-Optimize-collections.patch} (98%) rename divinemc-server/minecraft-patches/features/{0070-Optimize-Moonrise.patch => 0069-Optimize-Moonrise.patch} (100%) rename divinemc-server/minecraft-patches/features/{0069-lithium-combined_heightmap_update.patch => 0070-lithium-combined_heightmap_update.patch} (100%) diff --git a/divinemc-server/minecraft-patches/features/0043-Implement-Secure-Seed.patch b/divinemc-server/minecraft-patches/features/0041-Implement-Secure-Seed.patch similarity index 99% rename from divinemc-server/minecraft-patches/features/0043-Implement-Secure-Seed.patch rename to divinemc-server/minecraft-patches/features/0041-Implement-Secure-Seed.patch index c5ca6d9..8cee601 100644 --- a/divinemc-server/minecraft-patches/features/0043-Implement-Secure-Seed.patch +++ b/divinemc-server/minecraft-patches/features/0041-Implement-Secure-Seed.patch @@ -64,7 +64,7 @@ index 301b45e375dafeefed56eb0db5dd51eea4c97459..65607de63f6ea900599660485861860b } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index e1497f28b870e014e89ec6b189ee7989b07bb933..b240c7f2579e25d520fbc0ab08e801028bc15192 100644 +index 2f09f9c02e63563828dd7000352baf2723a0ac59..4f4ede83b6ca5e1884607410b526a675fed4d42d 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -655,6 +655,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/divinemc-server/minecraft-patches/features/0042-Dynamic-Activation-of-Brain.patch b/divinemc-server/minecraft-patches/features/0042-Dynamic-Activation-of-Brain.patch index aaea614..fc6fb72 100644 --- a/divinemc-server/minecraft-patches/features/0042-Dynamic-Activation-of-Brain.patch +++ b/divinemc-server/minecraft-patches/features/0042-Dynamic-Activation-of-Brain.patch @@ -31,10 +31,10 @@ index ca21597263cb430e2a5ae07e8cecfb0d53a270d2..226088405c019922085285ba5d04d7c1 } } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 2f09f9c02e63563828dd7000352baf2723a0ac59..e1497f28b870e014e89ec6b189ee7989b07bb933 100644 +index 4f4ede83b6ca5e1884607410b526a675fed4d42d..b240c7f2579e25d520fbc0ab08e801028bc15192 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -829,6 +829,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -830,6 +830,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.entityTickList .forEach( entity -> { diff --git a/divinemc-server/minecraft-patches/features/0045-Petal-Async-Pathfinding.patch b/divinemc-server/minecraft-patches/features/0043-Petal-Async-Pathfinding.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0045-Petal-Async-Pathfinding.patch rename to divinemc-server/minecraft-patches/features/0043-Petal-Async-Pathfinding.patch diff --git a/divinemc-server/minecraft-patches/features/0049-Petal-Multithreaded-Tracker.patch b/divinemc-server/minecraft-patches/features/0044-Petal-Multithreaded-Tracker.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0049-Petal-Multithreaded-Tracker.patch rename to divinemc-server/minecraft-patches/features/0044-Petal-Multithreaded-Tracker.patch diff --git a/divinemc-server/minecraft-patches/features/0046-Pufferfish-Optimize-mob-spawning.patch b/divinemc-server/minecraft-patches/features/0045-Pufferfish-Optimize-mob-spawning.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0046-Pufferfish-Optimize-mob-spawning.patch rename to divinemc-server/minecraft-patches/features/0045-Pufferfish-Optimize-mob-spawning.patch diff --git a/divinemc-server/minecraft-patches/features/0057-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch b/divinemc-server/minecraft-patches/features/0046-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0057-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch rename to divinemc-server/minecraft-patches/features/0046-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch diff --git a/divinemc-server/minecraft-patches/features/0041-Clump-experience-orbs.patch b/divinemc-server/minecraft-patches/features/0048-Clump-experience-orbs.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0041-Clump-experience-orbs.patch rename to divinemc-server/minecraft-patches/features/0048-Clump-experience-orbs.patch diff --git a/divinemc-server/minecraft-patches/features/0051-SparklyPaper-Parallel-world-ticking.patch b/divinemc-server/minecraft-patches/features/0049-SparklyPaper-Parallel-world-ticking.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0051-SparklyPaper-Parallel-world-ticking.patch rename to divinemc-server/minecraft-patches/features/0049-SparklyPaper-Parallel-world-ticking.patch diff --git a/divinemc-server/minecraft-patches/features/0053-MSPT-Tracking-for-each-world.patch b/divinemc-server/minecraft-patches/features/0050-MSPT-Tracking-for-each-world.patch similarity index 95% rename from divinemc-server/minecraft-patches/features/0053-MSPT-Tracking-for-each-world.patch rename to divinemc-server/minecraft-patches/features/0050-MSPT-Tracking-for-each-world.patch index f9a97d5..95b7f93 100644 --- a/divinemc-server/minecraft-patches/features/0053-MSPT-Tracking-for-each-world.patch +++ b/divinemc-server/minecraft-patches/features/0050-MSPT-Tracking-for-each-world.patch @@ -25,7 +25,7 @@ index 9e09e9823f53e60c819d43012905fa21d044e283..e3fb85c466aca52bd4431aabbc13a4de CrashReport crashReport = CrashReport.forThrowable(levelTickingException, "Exception ticking world"); serverLevel.fillReportDetails(crashReport); diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 8e1705b301c8e880d0a8dbce1025890b3265b77b..33f9e1306c6e0315f256ab65aa594624b47593ae 100644 +index f22762d2e0c97246415669baa7b3d713bb6e929a..d27a130f80cb8225a30b289b9d06c5c508a55ea7 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -596,6 +596,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/divinemc-server/minecraft-patches/features/0056-Catch-update-suppressors.patch b/divinemc-server/minecraft-patches/features/0051-Catch-update-suppressors.patch similarity index 96% rename from divinemc-server/minecraft-patches/features/0056-Catch-update-suppressors.patch rename to divinemc-server/minecraft-patches/features/0051-Catch-update-suppressors.patch index 1d3bc8e..4edccbc 100644 --- a/divinemc-server/minecraft-patches/features/0056-Catch-update-suppressors.patch +++ b/divinemc-server/minecraft-patches/features/0051-Catch-update-suppressors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Catch update suppressors diff --git a/net/minecraft/network/PacketProcessor.java b/net/minecraft/network/PacketProcessor.java -index ae0eb872f59be23126a7d44056607058c81a0e81..e76530da9641acc482aa0f030c4dc2670b1f7b14 100644 +index 3e4241976fdfe65bc0aae90a9097770745c0ddf1..98b101fde04fbf5507f021bb8d8e6bed334de5b6 100644 --- a/net/minecraft/network/PacketProcessor.java +++ b/net/minecraft/network/PacketProcessor.java -@@ -77,6 +77,10 @@ public class PacketProcessor implements AutoCloseable { +@@ -97,6 +97,10 @@ public class PacketProcessor implements AutoCloseable { if (this.listener.shouldHandleMessage(this.packet)) { try { this.packet.handle(this.listener); diff --git a/divinemc-server/minecraft-patches/features/0054-Regionized-Chunk-Ticking.patch b/divinemc-server/minecraft-patches/features/0052-Regionized-Chunk-Ticking.patch similarity index 98% rename from divinemc-server/minecraft-patches/features/0054-Regionized-Chunk-Ticking.patch rename to divinemc-server/minecraft-patches/features/0052-Regionized-Chunk-Ticking.patch index 508d01a..4873d06 100644 --- a/divinemc-server/minecraft-patches/features/0054-Regionized-Chunk-Ticking.patch +++ b/divinemc-server/minecraft-patches/features/0052-Regionized-Chunk-Ticking.patch @@ -8,7 +8,7 @@ This patch adds regionized chunk ticking feature, by grouping adjacent chunks in Original idea by Dueris, modified by NONPLAYT and heavily optimized by dan28000 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java -index 78650957bacc0e26d3299a8de7f8bfc57c86627c..f6e5fb11b471c34cbc7f3082b23c0a2a14331363 100644 +index 3f85f9e9551b2eed6e66ab8036dbb1f40fb8bbac..2da4ba00963c9ff6715fe60aa2f6af724fa8ed61 100644 --- a/net/minecraft/network/Connection.java +++ b/net/minecraft/network/Connection.java @@ -327,7 +327,7 @@ public class Connection extends SimpleChannelInboundHandler> { @@ -407,7 +407,7 @@ index bfc200f39a22664204b5aa66d3911abdb368e563..50daa39747a0f07c4d31a13c4410819a this.level.tickCustomSpawners(this.spawnEnemies); } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 33f9e1306c6e0315f256ab65aa594624b47593ae..668e20075c875775ac0bf355d7318c3ff1426fc0 100644 +index d27a130f80cb8225a30b289b9d06c5c508a55ea7..f4399659d084ed9703052b3ce2c82a9e198cd514 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -197,7 +197,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -433,7 +433,7 @@ index 33f9e1306c6e0315f256ab65aa594624b47593ae..668e20075c875775ac0bf355d7318c3f io.papermc.paper.entity.activation.ActivationRange.activateEntities(this); // Paper - EAR this.entityTickList .forEach( -@@ -1849,22 +1856,16 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1862,22 +1869,16 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe if (Shapes.joinIsNotEmpty(collisionShape, collisionShape1, BooleanOp.NOT_SAME)) { List list = new ObjectArrayList<>(); @@ -465,7 +465,7 @@ index 33f9e1306c6e0315f256ab65aa594624b47593ae..668e20075c875775ac0bf355d7318c3f try { this.isUpdatingNavigations = true; diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index 250978ef6e09c8744065d143af38b99914bd25ec..e6d0977091042bb1b91c70190f6366cb4bd4d3c4 100644 +index 49c4d40e802f8adaba52d929ba013d3953704989..9f559be50c990d15d7765827b7c4c4092f5e184a 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java @@ -112,7 +112,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/divinemc-server/minecraft-patches/features/0044-C2ME-Limit-NBT-cache.patch b/divinemc-server/minecraft-patches/features/0053-C2ME-Limit-NBT-cache.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0044-C2ME-Limit-NBT-cache.patch rename to divinemc-server/minecraft-patches/features/0053-C2ME-Limit-NBT-cache.patch diff --git a/divinemc-server/minecraft-patches/features/0055-C2ME-Optimize-Aquifer-and-Beardifier.patch b/divinemc-server/minecraft-patches/features/0054-C2ME-Optimize-Aquifer-and-Beardifier.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0055-C2ME-Optimize-Aquifer-and-Beardifier.patch rename to divinemc-server/minecraft-patches/features/0054-C2ME-Optimize-Aquifer-and-Beardifier.patch diff --git a/divinemc-server/minecraft-patches/features/0048-Copper-Bulb-1gt-delay.patch b/divinemc-server/minecraft-patches/features/0055-Copper-Bulb-1gt-delay.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0048-Copper-Bulb-1gt-delay.patch rename to divinemc-server/minecraft-patches/features/0055-Copper-Bulb-1gt-delay.patch diff --git a/divinemc-server/minecraft-patches/features/0050-Crafter-1gt-delay.patch b/divinemc-server/minecraft-patches/features/0056-Crafter-1gt-delay.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0050-Crafter-1gt-delay.patch rename to divinemc-server/minecraft-patches/features/0056-Crafter-1gt-delay.patch diff --git a/divinemc-server/minecraft-patches/features/0061-Raytrace-Entity-Tracker.patch b/divinemc-server/minecraft-patches/features/0057-Raytrace-Entity-Tracker.patch similarity index 97% rename from divinemc-server/minecraft-patches/features/0061-Raytrace-Entity-Tracker.patch rename to divinemc-server/minecraft-patches/features/0057-Raytrace-Entity-Tracker.patch index 4002ecd..f309780 100644 --- a/divinemc-server/minecraft-patches/features/0061-Raytrace-Entity-Tracker.patch +++ b/divinemc-server/minecraft-patches/features/0057-Raytrace-Entity-Tracker.patch @@ -10,7 +10,7 @@ Original project: https://github.com/LogisticsCraft/OcclusionCulling Original license: MIT diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 2bf4f7c612318c6cb3f21f111811cc28766298e0..ee33af29c7f98df04f687dde627413e186c42221 100644 +index 167c244433fd77b5d0cc0975965f04c5d88001fa..b26226f6479f7b9c58a1355639c6f264e161ab50 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -147,7 +147,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter; @@ -22,7 +22,7 @@ index 2bf4f7c612318c6cb3f21f111811cc28766298e0..ee33af29c7f98df04f687dde627413e1 public static javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino"); // Purpur - Configurable entity base attributes // CraftBukkit start private static final int CURRENT_LEVEL = 2; -@@ -5535,4 +5535,47 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name +@@ -5565,4 +5565,47 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name return false; } // Purpur end - Ridables diff --git a/divinemc-server/minecraft-patches/features/0065-Leaves-Protocol-Core.patch b/divinemc-server/minecraft-patches/features/0058-Leaves-Protocol-Core.patch similarity index 95% rename from divinemc-server/minecraft-patches/features/0065-Leaves-Protocol-Core.patch rename to divinemc-server/minecraft-patches/features/0058-Leaves-Protocol-Core.patch index 11cbdcb..f0373ab 100644 --- a/divinemc-server/minecraft-patches/features/0065-Leaves-Protocol-Core.patch +++ b/divinemc-server/minecraft-patches/features/0058-Leaves-Protocol-Core.patch @@ -35,7 +35,7 @@ index fb263fa1f30a7dfcb7ec2656abfb38e5fe88eac9..c3be4c2fd4a544967322a45d3b8c0fe7 }; } diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 83ccf00e3cff9dced3cc97abffd7881b0be5420e..60e77f74124027cc73fd4366b77fdb54c68273e5 100644 +index db392b8596f1f0438894a9fa8246beeb69ce0fd6..90303969f330b40785795531dedb737743b6123a 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1824,6 +1824,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> { diff --git a/divinemc-server/minecraft-patches/features/0064-Linear-region-file-format.patch b/divinemc-server/minecraft-patches/features/0060-Linear-region-file-format.patch similarity index 99% rename from divinemc-server/minecraft-patches/features/0064-Linear-region-file-format.patch rename to divinemc-server/minecraft-patches/features/0060-Linear-region-file-format.patch index 2f816d3..49b3944 100644 --- a/divinemc-server/minecraft-patches/features/0064-Linear-region-file-format.patch +++ b/divinemc-server/minecraft-patches/features/0060-Linear-region-file-format.patch @@ -60,7 +60,7 @@ index 51c126735ace8fdde89ad97b5cab62f244212db0..23f6ed26b531ea570fdf2ae48c1e2710 + public void moonrise$write(final org.bxteam.divinemc.region.IRegionFile regionFile) throws IOException; // DivineMC - Buffered Linear region format } diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index db392b8596f1f0438894a9fa8246beeb69ce0fd6..83ccf00e3cff9dced3cc97abffd7881b0be5420e 100644 +index 90303969f330b40785795531dedb737743b6123a..60e77f74124027cc73fd4366b77fdb54c68273e5 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -934,10 +934,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> { +@@ -610,13 +610,7 @@ public class Connection extends SimpleChannelInboundHandler> { if (!(this.packetListener instanceof net.minecraft.server.network.ServerLoginPacketListenerImpl loginPacketListener) || loginPacketListener.state != net.minecraft.server.network.ServerLoginPacketListenerImpl.State.VERIFYING || Connection.joinAttemptsThisTick++ < MAX_PER_TICK) { @@ -24,7 +24,7 @@ index 3f85f9e9551b2eed6e66ab8036dbb1f40fb8bbac..78650957bacc0e26d3299a8de7f8bfc5 } diff --git a/net/minecraft/network/PacketProcessor.java b/net/minecraft/network/PacketProcessor.java -index 3e4241976fdfe65bc0aae90a9097770745c0ddf1..ae0eb872f59be23126a7d44056607058c81a0e81 100644 +index 98b101fde04fbf5507f021bb8d8e6bed334de5b6..e76530da9641acc482aa0f030c4dc2670b1f7b14 100644 --- a/net/minecraft/network/PacketProcessor.java +++ b/net/minecraft/network/PacketProcessor.java @@ -71,28 +71,8 @@ public class PacketProcessor implements AutoCloseable { @@ -56,7 +56,7 @@ index 3e4241976fdfe65bc0aae90a9097770745c0ddf1..ae0eb872f59be23126a7d44056607058 if (this.listener instanceof net.minecraft.server.network.ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // Paper - Don't handle sync packets for kicked players if (this.listener.shouldHandleMessage(this.packet)) { try { -@@ -107,12 +87,6 @@ public class PacketProcessor implements AutoCloseable { +@@ -111,12 +91,6 @@ public class PacketProcessor implements AutoCloseable { } else { PacketProcessor.LOGGER.debug("Ignoring packet due to disconnection: {}", this.packet); } @@ -70,10 +70,10 @@ index 3e4241976fdfe65bc0aae90a9097770745c0ddf1..ae0eb872f59be23126a7d44056607058 } } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index f22762d2e0c97246415669baa7b3d713bb6e929a..8e1705b301c8e880d0a8dbce1025890b3265b77b 100644 +index f4399659d084ed9703052b3ce2c82a9e198cd514..668e20075c875775ac0bf355d7318c3ff1426fc0 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -1372,13 +1372,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1385,13 +1385,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe // Paper end - log detailed entity tick information public void tickNonPassenger(Entity entity) { @@ -87,7 +87,7 @@ index f22762d2e0c97246415669baa7b3d713bb6e929a..8e1705b301c8e880d0a8dbce1025890b entity.setOldPosAndRot(); entity.tickCount++; entity.totalEntityAge++; // Paper - age-like counter for all entities -@@ -1391,13 +1385,6 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1404,13 +1398,6 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe for (Entity entity1 : entity.getPassengers()) { this.tickPassenger(entity, entity1, isActive); // Paper - EAR 2 } @@ -102,7 +102,7 @@ index f22762d2e0c97246415669baa7b3d713bb6e929a..8e1705b301c8e880d0a8dbce1025890b private void tickPassenger(Entity ridingEntity, Entity passengerEntity, final boolean isActive) { // Paper - EAR 2 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 167c244433fd77b5d0cc0975965f04c5d88001fa..2bf4f7c612318c6cb3f21f111811cc28766298e0 100644 +index b26226f6479f7b9c58a1355639c6f264e161ab50..ee33af29c7f98df04f687dde627413e186c42221 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1117,29 +1117,10 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name diff --git a/divinemc-server/minecraft-patches/features/0058-C2ME-The-End-Biome-Cache.patch b/divinemc-server/minecraft-patches/features/0062-C2ME-The-End-Biome-Cache.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0058-C2ME-The-End-Biome-Cache.patch rename to divinemc-server/minecraft-patches/features/0062-C2ME-The-End-Biome-Cache.patch diff --git a/divinemc-server/minecraft-patches/features/0059-Euclidean-distance-squared-option.patch b/divinemc-server/minecraft-patches/features/0063-Euclidean-distance-squared-option.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0059-Euclidean-distance-squared-option.patch rename to divinemc-server/minecraft-patches/features/0063-Euclidean-distance-squared-option.patch diff --git a/divinemc-server/minecraft-patches/features/0060-Do-not-send-spectator-change-packet.patch b/divinemc-server/minecraft-patches/features/0064-Do-not-send-spectator-change-packet.patch similarity index 95% rename from divinemc-server/minecraft-patches/features/0060-Do-not-send-spectator-change-packet.patch rename to divinemc-server/minecraft-patches/features/0064-Do-not-send-spectator-change-packet.patch index 5c83312..7c124d4 100644 --- a/divinemc-server/minecraft-patches/features/0060-Do-not-send-spectator-change-packet.patch +++ b/divinemc-server/minecraft-patches/features/0064-Do-not-send-spectator-change-packet.patch @@ -39,10 +39,10 @@ index 07dd9b8088e363110ecab24026a20485484710c4..a51d506c4ffe11ac2ad8510a9b35d854 + // DivineMC end - Do not send spectator change packet } diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 8524060daabd3bc34c938313f30ed247759bdd5a..34b2cee473713d7830537c37100f37b0b38bc067 100644 +index f290b3291ee20c77a301adc57c933788ebc6d56d..57577a81888203f1e19dc8a804ca9f1ee764c49e 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java -@@ -256,6 +256,7 @@ public abstract class PlayerList { +@@ -258,6 +258,7 @@ public abstract class PlayerList { // CraftBukkit start - sendAll above replaced with this loop ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)); // Paper - Add Listing API for Player @@ -50,7 +50,7 @@ index 8524060daabd3bc34c938313f30ed247759bdd5a..34b2cee473713d7830537c37100f37b0 final List onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1); // Paper - Use single player info update packet on join for (int i = 0; i < this.players.size(); ++i) { -@@ -265,7 +266,7 @@ public abstract class PlayerList { +@@ -267,7 +268,7 @@ public abstract class PlayerList { // Paper start - Add Listing API for Player if (entityplayer1.getBukkitEntity().isListed(bukkitPlayer)) { // Paper end - Add Listing API for Player @@ -59,7 +59,7 @@ index 8524060daabd3bc34c938313f30ed247759bdd5a..34b2cee473713d7830537c37100f37b0 // Paper start - Add Listing API for Player } else { entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false)); -@@ -281,7 +282,10 @@ public abstract class PlayerList { +@@ -283,7 +284,10 @@ public abstract class PlayerList { } // Paper start - Use single player info update packet on join if (!onlinePlayers.isEmpty()) { @@ -71,7 +71,7 @@ index 8524060daabd3bc34c938313f30ed247759bdd5a..34b2cee473713d7830537c37100f37b0 } // Paper end - Use single player info update packet on join player.sentListPacket = true; -@@ -1399,4 +1403,69 @@ public abstract class PlayerList { +@@ -1403,4 +1407,69 @@ public abstract class PlayerList { public boolean isAllowCommandsForAllPlayers() { return this.allowCommandsForAllPlayers; } diff --git a/divinemc-server/minecraft-patches/features/0062-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch b/divinemc-server/minecraft-patches/features/0065-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch similarity index 95% rename from divinemc-server/minecraft-patches/features/0062-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch rename to divinemc-server/minecraft-patches/features/0065-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch index 5081b84..203e6f8 100644 --- a/divinemc-server/minecraft-patches/features/0062-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch +++ b/divinemc-server/minecraft-patches/features/0065-Paper-PR-Fire-ServerListPingEvent-for-secondary-motd.patch @@ -8,7 +8,7 @@ Original project: https://github.com/PaperMC/Paper Paper pull request: https://github.com/PaperMC/Paper/pull/8074 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 34b2cee473713d7830537c37100f37b0b38bc067..5106bfb8b48d963dca4784db1787123e9475ada0 100644 +index 57577a81888203f1e19dc8a804ca9f1ee764c49e..eab5505b10c1044f864a7327b18f1389fd09765f 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -209,10 +209,15 @@ public abstract class PlayerList { diff --git a/divinemc-server/minecraft-patches/features/0063-Configurable-player-spawn-tracking-range.patch b/divinemc-server/minecraft-patches/features/0066-Configurable-player-spawn-tracking-range.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0063-Configurable-player-spawn-tracking-range.patch rename to divinemc-server/minecraft-patches/features/0066-Configurable-player-spawn-tracking-range.patch diff --git a/divinemc-server/minecraft-patches/features/0066-Optimize-collections.patch b/divinemc-server/minecraft-patches/features/0067-Optimize-collections.patch similarity index 98% rename from divinemc-server/minecraft-patches/features/0066-Optimize-collections.patch rename to divinemc-server/minecraft-patches/features/0067-Optimize-collections.patch index c7b2f87..d3b751b 100644 --- a/divinemc-server/minecraft-patches/features/0066-Optimize-collections.patch +++ b/divinemc-server/minecraft-patches/features/0067-Optimize-collections.patch @@ -54,7 +54,7 @@ index 5fb9a4cebf7407b8166ea5716c48a68e658d68d3..304ff53e2c21c6153ff8f04436eae66b public int serverViewDistance; public final WorldGenContext worldGenContext; // Paper - public diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index e6d0977091042bb1b91c70190f6366cb4bd4d3c4..ccf9e2d5ef57ecdf1c7471620c5baa33575738e2 100644 +index 9f559be50c990d15d7765827b7c4c4092f5e184a..9235c1e9dc6f050ae9e62ad423572ddef278a240 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java @@ -259,7 +259,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/divinemc-server/minecraft-patches/features/0070-Optimize-Moonrise.patch b/divinemc-server/minecraft-patches/features/0069-Optimize-Moonrise.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0070-Optimize-Moonrise.patch rename to divinemc-server/minecraft-patches/features/0069-Optimize-Moonrise.patch diff --git a/divinemc-server/minecraft-patches/features/0069-lithium-combined_heightmap_update.patch b/divinemc-server/minecraft-patches/features/0070-lithium-combined_heightmap_update.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0069-lithium-combined_heightmap_update.patch rename to divinemc-server/minecraft-patches/features/0070-lithium-combined_heightmap_update.patch