Sand duping need plugin

KaiijuMC · Apr 1, 2023 · d36d0dc · d36d0dc
1 parent f6246f3
commit d36d0dc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 88 deletions.
diff --git a/patches/server/0003-Kaiiju-Exploit-Configuration.patch b/patches/server/0003-Kaiiju-Exploit-Configuration.patch
diff --git a/...5-Kaiiju-RegionFormat-Configuration.patch → ...3-Kaiiju-RegionFormat-Configuration.patch b/...5-Kaiiju-RegionFormat-Configuration.patch → ...3-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<String, Object> value = getMap("world-settings." + worldName + "." + path, null);
+         return value.isEmpty() ? fallback : value;
      }
 +
 +    public List<String> regionFormatList = Arrays.asList("ANVIL", "LINEAR");

diff --git a/...ver/0006-Kaiiju-RegionFormat-Linear.patch → ...ver/0004-Kaiiju-RegionFormat-Linear.patch b/...ver/0006-Kaiiju-RegionFormat-Linear.patch → ...ver/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
diff --git a/...r/0007-Kaiiju-Network-Configuration.patch → ...r/0005-Kaiiju-Network-Configuration.patch b/...r/0007-Kaiiju-Network-Configuration.patch → ...r/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/...ur-Network-Send-Null-Entity-Packets.patch → ...ur-Network-Send-Null-Entity-Packets.patch b/...ur-Network-Send-Null-Entity-Packets.patch → ...ur-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/...-Purpur-Network-Alternate-Keepalive.patch → ...-Purpur-Network-Alternate-Keepalive.patch b/...-Purpur-Network-Alternate-Keepalive.patch → ...-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;