diff --git a/patches/server/0003-Kaiiju-Exploit-Configuration.patch b/patches/server/0003-Kaiiju-Exploit-Configuration.patch deleted file mode 100644 index 56bb4c0..0000000 --- a/patches/server/0003-Kaiiju-Exploit-Configuration.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com> -Date: Fri, 31 Mar 2023 01:13:35 +0300 -Subject: [PATCH] Kaiiju Exploit Configuration - - -diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index 7da7e0aeb5eac9ac73a3570e716f1ceb11fd7027..75f9fc471069507168ad23092bc77e0d1597fd1d 100644 ---- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -192,4 +192,7 @@ public class KaiijuConfig { - } - return builder.build(); - } -+ -+ private static void exploitSettings() { -+ } - } -diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java -index dd4c3ca77acb3aeefc69b8eb948b8b202ff87a19..0555d436e38c388578e563a9120ebfe5334ae2c2 100644 ---- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java -+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java -@@ -122,4 +122,7 @@ public class KaiijuWorldConfig { - final Map value = getMap("world-settings." + worldName + "." + path, null); - return value.isEmpty() ? fallback : value; - } -+ -+ private void exploitSettings() { -+ } - } -\ No newline at end of file diff --git a/patches/server/0005-Kaiiju-RegionFormat-Configuration.patch b/patches/server/0003-Kaiiju-RegionFormat-Configuration.patch similarity index 89% rename from patches/server/0005-Kaiiju-RegionFormat-Configuration.patch rename to patches/server/0003-Kaiiju-RegionFormat-Configuration.patch index 6c25179..9ab3560 100644 --- a/patches/server/0005-Kaiiju-RegionFormat-Configuration.patch +++ b/patches/server/0003-Kaiiju-RegionFormat-Configuration.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Kaiiju RegionFormat Configuration diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index 75f9fc471069507168ad23092bc77e0d1597fd1d..6af036b2d11aa74bb4a371c03bd2e637f49ed166 100644 +index 7da7e0aeb5eac9ac73a3570e716f1ceb11fd7027..b86c90cc3601e666998cfa12f44515f605bb53eb 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -195,4 +195,10 @@ public class KaiijuConfig { - - private static void exploitSettings() { +@@ -192,4 +192,10 @@ public class KaiijuConfig { + } + return builder.build(); } + + public static boolean regionFormatDebug = false; @@ -20,7 +20,7 @@ index 75f9fc471069507168ad23092bc77e0d1597fd1d..6af036b2d11aa74bb4a371c03bd2e637 + } } diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java -index 410bb2832140648ab0b59a35545a27f7d78c7222..421d21d3f1126101e66d54894a39b657de7d1590 100644 +index dd4c3ca77acb3aeefc69b8eb948b8b202ff87a19..b194f4dbebcbbf5bb4e026a0169e2d24806b46ec 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java @@ -4,9 +4,11 @@ import org.apache.commons.lang.BooleanUtils; @@ -35,9 +35,9 @@ index 410bb2832140648ab0b59a35545a27f7d78c7222..421d21d3f1126101e66d54894a39b657 import static dev.kaiijumc.kaiiju.KaiijuConfig.log; -@@ -128,4 +130,23 @@ public class KaiijuWorldConfig { - private void exploitSettings() { - fixSandDuping = getBoolean("exploit.fix-sand-duping", fixSandDuping); +@@ -122,4 +124,23 @@ public class KaiijuWorldConfig { + final Map value = getMap("world-settings." + worldName + "." + path, null); + return value.isEmpty() ? fallback : value; } + + public List regionFormatList = Arrays.asList("ANVIL", "LINEAR"); diff --git a/patches/server/0006-Kaiiju-RegionFormat-Linear.patch b/patches/server/0004-Kaiiju-RegionFormat-Linear.patch similarity index 100% rename from patches/server/0006-Kaiiju-RegionFormat-Linear.patch rename to patches/server/0004-Kaiiju-RegionFormat-Linear.patch diff --git a/patches/server/0004-Purpur-Exploit-Toggleable-Sand-Duping.patch b/patches/server/0004-Purpur-Exploit-Toggleable-Sand-Duping.patch deleted file mode 100644 index 4093255..0000000 --- a/patches/server/0004-Purpur-Exploit-Toggleable-Sand-Duping.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com> -Date: Fri, 31 Mar 2023 01:21:52 +0300 -Subject: [PATCH] Purpur Exploit Toggleable Sand Duping - - -diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java -index 0555d436e38c388578e563a9120ebfe5334ae2c2..410bb2832140648ab0b59a35545a27f7d78c7222 100644 ---- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java -+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java -@@ -123,6 +123,9 @@ public class KaiijuWorldConfig { - return value.isEmpty() ? fallback : value; - } - -+ public boolean fixSandDuping = true; -+ - private void exploitSettings() { -+ fixSandDuping = getBoolean("exploit.fix-sand-duping", fixSandDuping); - } - } -\ No newline at end of file -diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -index c8d125955754e27da54d95fb5b1cea39ca54b618..f0a15acb604bb636bd49c0ce931053541986797d 100644 ---- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -@@ -131,7 +131,7 @@ public class FallingBlockEntity extends Entity { - @Override - public void tick() { - // Paper start - fix sand duping -- if (this.isRemoved()) { -+ if (this.level.kaiijuConfig.fixSandDuping && this.isRemoved()) { // Kaiiju - return; - } - // Paper end - fix sand duping -@@ -148,7 +148,7 @@ public class FallingBlockEntity extends Entity { - this.move(MoverType.SELF, this.getDeltaMovement()); - - // Paper start - fix sand duping -- if (this.isRemoved()) { -+ if (this.level.kaiijuConfig.fixSandDuping && this.isRemoved()) { // Kaiiju - return; - } - // Paper end - fix sand duping diff --git a/patches/server/0007-Kaiiju-Network-Configuration.patch b/patches/server/0005-Kaiiju-Network-Configuration.patch similarity index 82% rename from patches/server/0007-Kaiiju-Network-Configuration.patch rename to patches/server/0005-Kaiiju-Network-Configuration.patch index d370b29..8a26228 100644 --- a/patches/server/0007-Kaiiju-Network-Configuration.patch +++ b/patches/server/0005-Kaiiju-Network-Configuration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Kaiiju Network Configuration diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index 6af036b2d11aa74bb4a371c03bd2e637f49ed166..8e7892cb46385ba3189485c144ec9fbcdc347502 100644 +index b86c90cc3601e666998cfa12f44515f605bb53eb..7c6d43d8a360530344ef296f4477750c8a298607 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -201,4 +201,7 @@ public class KaiijuConfig { +@@ -198,4 +198,7 @@ public class KaiijuConfig { private static void regionFormatSettings() { regionFormatDebug = getBoolean("region-format.debug", regionFormatDebug); } diff --git a/patches/server/0008-Purpur-Network-Send-Null-Entity-Packets.patch b/patches/server/0006-Purpur-Network-Send-Null-Entity-Packets.patch similarity index 95% rename from patches/server/0008-Purpur-Network-Send-Null-Entity-Packets.patch rename to patches/server/0006-Purpur-Network-Send-Null-Entity-Packets.patch index 9fcefc0..cc76e50 100644 --- a/patches/server/0008-Purpur-Network-Send-Null-Entity-Packets.patch +++ b/patches/server/0006-Purpur-Network-Send-Null-Entity-Packets.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur Network Send Null Entity Packets diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index 8e7892cb46385ba3189485c144ec9fbcdc347502..94a033e835915dc84c0dd4a84d218c0283aa03fe 100644 +index 7c6d43d8a360530344ef296f4477750c8a298607..ab08e11f13921163b8ff1ff51ff9e9b86d2b47c7 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -201,7 +201,10 @@ public class KaiijuConfig { +@@ -198,7 +198,10 @@ public class KaiijuConfig { private static void regionFormatSettings() { regionFormatDebug = getBoolean("region-format.debug", regionFormatDebug); } diff --git a/patches/server/0009-Purpur-Network-Alternate-Keepalive.patch b/patches/server/0007-Purpur-Network-Alternate-Keepalive.patch similarity index 96% rename from patches/server/0009-Purpur-Network-Alternate-Keepalive.patch rename to patches/server/0007-Purpur-Network-Alternate-Keepalive.patch index 4b0704f..1383763 100644 --- a/patches/server/0009-Purpur-Network-Alternate-Keepalive.patch +++ b/patches/server/0007-Purpur-Network-Alternate-Keepalive.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur Network Alternate Keepalive diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index 94a033e835915dc84c0dd4a84d218c0283aa03fe..e88e9197e99ac68fd58d48e7722eb6254ee75388 100644 +index ab08e11f13921163b8ff1ff51ff9e9b86d2b47c7..edaeba20d871925ae05f7f1cabb3ac8eb71b4655 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -203,8 +203,10 @@ public class KaiijuConfig { +@@ -200,8 +200,10 @@ public class KaiijuConfig { } public static boolean sendNullEntityPackets = true;