diff --git a/patches/server/0014-Fix-memory-leak.patch b/patches/removed/1.20/server/0014-Fix-memory-leak.patch similarity index 97% rename from patches/server/0014-Fix-memory-leak.patch rename to patches/removed/1.20/server/0014-Fix-memory-leak.patch index 844807b..15c4d57 100644 --- a/patches/server/0014-Fix-memory-leak.patch +++ b/patches/removed/1.20/server/0014-Fix-memory-leak.patch @@ -3,6 +3,7 @@ From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Sat, 10 Jun 2023 13:06:44 +0300 Subject: [PATCH] Fix memory leak +removed due pufferfish patches was added back diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java index 65012a12e1430956ef55ced56773e6354ac26444..2bcd3ee3bbdf246ef429a8310ca96ba3fb4afd2c 100644 diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/server/0002-Divine-Configuration.patch index 00da0ee..cbcbd98 100644 --- a/patches/server/0002-Divine-Configuration.patch +++ b/patches/server/0002-Divine-Configuration.patch @@ -327,12 +327,12 @@ index 0000000000000000000000000000000000000000..5d16d2250bae9c982a0af9ad2580a635 +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 27dec01dbed8b1836ab5b5af579b9ed95bc09582..a1e8b96af3040721438eab2bf5c679cccbfb40b8 100644 +index 12124d6fbc0406bb62bd95a0f7bab68afa43377c..6b4b687b114818cdd8bd2c6256d1d9cf1343bb83 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -232,6 +232,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider - // Paper end +@@ -235,6 +235,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish + gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish + // DivineMC start + try { @@ -348,7 +348,7 @@ index 27dec01dbed8b1836ab5b5af579b9ed95bc09582..a1e8b96af3040721438eab2bf5c679cc this.setFlightAllowed(dedicatedserverproperties.allowFlight); this.setMotd(dedicatedserverproperties.motd); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 5287a6fe5742bdfe179fe669ee1f1edfbbd0fae6..454ad3442076898dd476d86706f93facae1939af 100644 +index fdd55ac3720d44e3d246e05fe9a07b5f73bed0e8..de4a7223c672953c5d02d222638af7f9dcd602aa 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -15,6 +15,8 @@ import java.util.function.Consumer; @@ -368,7 +368,7 @@ index 5287a6fe5742bdfe179fe669ee1f1edfbbd0fae6..454ad3442076898dd476d86706f93fac public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; -@@ -321,6 +324,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -332,6 +335,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur @@ -377,7 +377,7 @@ index 5287a6fe5742bdfe179fe669ee1f1edfbbd0fae6..454ad3442076898dd476d86706f93fac this.generator = gen; this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ccf43d3d4fdb74b713d788f62d6a9b453701f6fb..a84dc72b69bfcbb12241b9dc5649ae074dc829a4 100644 +index 946f8adfe2138ad917a6a9100b7cf782303a7632..6a632b475f28c07f72b69b714dd8fe4619ff8072 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -15,6 +15,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode; @@ -412,7 +412,7 @@ index ccf43d3d4fdb74b713d788f62d6a9b453701f6fb..a84dc72b69bfcbb12241b9dc5649ae07 this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2855,6 +2859,13 @@ public final class CraftServer implements Server { +@@ -2860,6 +2864,13 @@ public final class CraftServer implements Server { } // Purpur end @@ -427,11 +427,11 @@ index ccf43d3d4fdb74b713d788f62d6a9b453701f6fb..a84dc72b69bfcbb12241b9dc5649ae07 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 20aed44f6d50ff279002259c05c84e7d15904142..9fee65801be4edc7a8fa916943a4a0827a1eb795 100644 +index 5afc4c3f865a21f3a2799f3a1a690f01768d9b4a..0467d5b81c4c0f977e4e8143bc70e43862a51a97 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -181,6 +181,14 @@ public class Main { - .describedAs("Yml file"); +@@ -187,6 +187,14 @@ public class Main { + .describedAs("Yml file"); // Purpur end + // DivineMC start diff --git a/patches/server/0007-Fix-entity-serialization.patch b/patches/server/0007-Fix-entity-serialization.patch index 1217575..0a39976 100644 --- a/patches/server/0007-Fix-entity-serialization.patch +++ b/patches/server/0007-Fix-entity-serialization.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix entity serialization diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a3305c9378bd7e4c24bc2e447cb1f47ccc0db0b4..b5e925377a0014e017d44b0d3436c10c5c86bb32 100644 +index 2197c3289f021c85e6e00fd16dcf12cc052ba023..11c84dd6eae457771362a5e6788bb459749e4838 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2288,15 +2288,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2322,15 +2322,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } @@ -25,7 +25,7 @@ index a3305c9378bd7e4c24bc2e447cb1f47ccc0db0b4..b5e925377a0014e017d44b0d3436c10c return this.isPassenger() ? false : this.saveAsPassenger(nbt); } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index b0dedc0883475fc2ecb9b3a22c43eb5d3b312dbe..0f28e6f0499ee427c5a0f82f04672d7ec16de00b 100644 +index 0aee1fadaeb948fd90d8e61ac57dbe7f810529ff..85d8963a95d855f6575eb9a1f33343dd0caca0f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -496,8 +496,13 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0010-Remove-Spigot-tick-limiter.patch b/patches/server/0010-Remove-Spigot-tick-limiter.patch index 1dec959..23d894a 100644 --- a/patches/server/0010-Remove-Spigot-tick-limiter.patch +++ b/patches/server/0010-Remove-Spigot-tick-limiter.patch @@ -7,7 +7,7 @@ Original code by Titaniumtown, modified by NONPLAYT You can find the original code on https://gitlab.com/Titaniumtown/JettPack diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 454ad3442076898dd476d86706f93facae1939af..e34fdd46a0c00a02dd8828140e294fa66ddb1770 100644 +index de4a7223c672953c5d02d222638af7f9dcd602aa..7700383d188835f6ac47c75e084abc3524f1f221 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -182,8 +182,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -19,7 +19,7 @@ index 454ad3442076898dd476d86706f93facae1939af..e34fdd46a0c00a02dd8828140e294fa6 private int tileTickPosition; public final Map explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions public java.util.ArrayDeque redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here -@@ -407,8 +405,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -425,8 +423,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { // CraftBukkit end timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper diff --git a/patches/server/0015-Fix-MC-110386.patch b/patches/server/0014-Fix-MC-110386.patch similarity index 100% rename from patches/server/0015-Fix-MC-110386.patch rename to patches/server/0014-Fix-MC-110386.patch diff --git a/patches/server/0016-Despawn-shulker-bullets-on-owner-death.patch b/patches/server/0015-Despawn-shulker-bullets-on-owner-death.patch similarity index 100% rename from patches/server/0016-Despawn-shulker-bullets-on-owner-death.patch rename to patches/server/0015-Despawn-shulker-bullets-on-owner-death.patch diff --git a/patches/server/0017-Fix-MC-31819.patch b/patches/server/0016-Fix-MC-31819.patch similarity index 100% rename from patches/server/0017-Fix-MC-31819.patch rename to patches/server/0016-Fix-MC-31819.patch diff --git a/patches/server/0018-lithium-collections.goals.patch b/patches/server/0017-lithium-collections.goals.patch similarity index 94% rename from patches/server/0018-lithium-collections.goals.patch rename to patches/server/0017-lithium-collections.goals.patch index e216f4e..17e984f 100644 --- a/patches/server/0018-lithium-collections.goals.patch +++ b/patches/server/0017-lithium-collections.goals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] lithium: collections.goals diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java -index 8a70bc63e12838f45fa3eade74f2899438715886..93a97455587db28fed1b2fa7ee8063ad08c5120e 100644 +index 02978315bc2b828cc603ce7478408f3f82c249c2..d8ee71cb3afc0f63669d26c4160f7cd7ed2fd453 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java @@ -13,6 +13,7 @@ import java.util.function.Supplier; diff --git a/patches/server/0019-Reduce-sensor-work.patch b/patches/server/0018-Reduce-sensor-work.patch similarity index 93% rename from patches/server/0019-Reduce-sensor-work.patch rename to patches/server/0018-Reduce-sensor-work.patch index 3f2f258..728b532 100644 --- a/patches/server/0019-Reduce-sensor-work.patch +++ b/patches/server/0018-Reduce-sensor-work.patch @@ -7,10 +7,10 @@ Original project: Bloom-host/Petal Link: https://github.com/Bloom-host/Petal diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b534b786ca1209652d13a1c6a77c03a9282946a2..32e9fea2319643e8de52e4b1710c8c3fd5e417af 100644 +index ba975b2fae383863ec731211f99d66731fa922c5..aa07817dfbcc1c6fc64757f9af1e50b12eadf9c1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1039,20 +1039,19 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1038,20 +1038,19 @@ public abstract class LivingEntity extends Entity implements Attackable { } if (entity != null) { diff --git a/patches/server/0020-lithium-ai.raid.patch b/patches/server/0019-lithium-ai.raid.patch similarity index 100% rename from patches/server/0020-lithium-ai.raid.patch rename to patches/server/0019-lithium-ai.raid.patch diff --git a/patches/server/0021-Do-not-drop-items-from-Give-command.patch b/patches/server/0020-Do-not-drop-items-from-Give-command.patch similarity index 100% rename from patches/server/0021-Do-not-drop-items-from-Give-command.patch rename to patches/server/0020-Do-not-drop-items-from-Give-command.patch diff --git a/patches/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0021-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 87% rename from patches/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/server/0021-Do-not-process-chat-commands-before-player-has-joine.patch index 0a7d0d6..d9ecfe2 100644 --- a/patches/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch +++ b/patches/server/0021-Do-not-process-chat-commands-before-player-has-joine.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Do not process chat/commands before player has joined diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9b2d2f5e45cf26ddd9897db5cfec23634e5d6cb3..d167d5ceeaca62e23b86c7a7229533d9ed54bedc 100644 +index e76eaa121f73cc56b0e3445eb976546daef87f99..b24293f65101703c28343129b8f38fc48ab47a17 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2427,6 +2427,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2428,6 +2428,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event ca }); // Paper - push to main return Optional.empty(); diff --git a/patches/server/0023-Fix-MC-2025.patch b/patches/server/0022-Fix-MC-2025.patch similarity index 91% rename from patches/server/0023-Fix-MC-2025.patch rename to patches/server/0022-Fix-MC-2025.patch index 13953ab..84a2adb 100644 --- a/patches/server/0023-Fix-MC-2025.patch +++ b/patches/server/0022-Fix-MC-2025.patch @@ -7,10 +7,10 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025 Fix taken from Reddit: https://redd.it/8pgd4q diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ff8258b1146d2899037a1fbd0ebc985df342eff4..92fe861c4b513999e3a0cc462f007f0dd60f26c3 100644 +index 11c84dd6eae457771362a5e6788bb459749e4838..9b405865c19742f71b30ea985bcdda9561f44e9c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2442,6 +2442,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2476,6 +2476,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { nbt.putBoolean("Purpur.FireImmune", immuneToFire); } // Purpur end @@ -28,7 +28,7 @@ index ff8258b1146d2899037a1fbd0ebc985df342eff4..92fe861c4b513999e3a0cc462f007f0d return nbt; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -2519,6 +2530,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2553,6 +2564,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.reapplyPosition(); } diff --git a/patches/server/0024-Paper-PR-Optimize-Varints.patch b/patches/server/0023-Paper-PR-Optimize-Varints.patch similarity index 100% rename from patches/server/0024-Paper-PR-Optimize-Varints.patch rename to patches/server/0023-Paper-PR-Optimize-Varints.patch diff --git a/patches/server/0025-Bump-Dependencies.patch b/patches/server/0024-Bump-Dependencies.patch similarity index 88% rename from patches/server/0025-Bump-Dependencies.patch rename to patches/server/0024-Bump-Dependencies.patch index 70980d8..7e4845d 100644 --- a/patches/server/0025-Bump-Dependencies.patch +++ b/patches/server/0024-Bump-Dependencies.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Mon, 12 Jun 2023 18:53:03 +0300 +Date: Fri, 16 Jun 2023 01:19:29 +0300 Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index 6b9e1fba27a79a7d07b0564f26ac8a24eb382d70..ad268607c5be6db4751a37f9c916e0af80278350 100644 +index 69c774a445054838719f00702d61c41f99723059..106730ad20b34be6b87764e483276ee8b04f6ec4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,13 +23,13 @@ dependencies { @@ -35,9 +35,9 @@ index 6b9e1fba27a79a7d07b0564f26ac8a24eb382d70..ad268607c5be6db4751a37f9c916e0af isTransitive = false } // Paper end -@@ -51,9 +51,9 @@ dependencies { - runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") - runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") +@@ -58,9 +58,9 @@ dependencies { + } + // Pufferfish end - testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test + testImplementation("io.github.classgraph:classgraph:4.8.151") // Paper - mob goal test // DivineMC - bump dependencies