Remove "fix-curing-zombie-villager-discount" exploit option (#9895)

This commit is contained in:
booky10 2023-11-04 20:20:01 +01:00 committed by GitHub
parent 44057da467
commit f78d7ce8ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
546 changed files with 356 additions and 354 deletions

View file

@ -1254,10 +1254,10 @@ index 0000000000000000000000000000000000000000..9e8b8de907654050c51400286af971ca
+}
diff --git a/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
new file mode 100644
index 0000000000000000000000000000000000000000..f0d4ec73bc8872a85e34f5c6b4d342e7562ca350
index 0000000000000000000000000000000000000000..351fbbc577556ebbd62222615801a96b7c115822
--- /dev/null
+++ b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
@@ -0,0 +1,77 @@
@@ -0,0 +1,78 @@
+package io.papermc.paper.configuration;
+
+import org.spongepowered.configurate.NodePath;
@ -1310,7 +1310,8 @@ index 0000000000000000000000000000000000000000..f0d4ec73bc8872a85e34f5c6b4d342e7
+ path("use-async-lighting"),
+ path("tnt-explosion-volume"),
+ path("entities", "spawning", "despawn-ranges", "soft"),
+ path("entities", "spawning", "despawn-ranges", "hard")
+ path("entities", "spawning", "despawn-ranges", "hard"),
+ path("fixes", "fix-curing-zombie-villager-discount-exploit")
+ };
+
+ NodePath[] REMOVED_GLOBAL_PATHS = {
@ -1337,10 +1338,10 @@ index 0000000000000000000000000000000000000000..f0d4ec73bc8872a85e34f5c6b4d342e7
+}
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..387a887d3aebb57da80bc36e36c2a7ea05cfd74f
index 0000000000000000000000000000000000000000..ed79d30f33b2674863b2d73b1abdb48433c33412
--- /dev/null
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -0,0 +1,539 @@
@@ -0,0 +1,538 @@
+package io.papermc.paper.configuration;
+
+import com.google.common.collect.HashBasedTable;
@ -1779,7 +1780,6 @@ index 0000000000000000000000000000000000000000..387a887d3aebb57da80bc36e36c2a7ea
+ public boolean disableUnloadedChunkEnderpearlExploit = true;
+ public boolean preventTntFromMovingInWater = false;
+ public boolean splitOverstackedLoot = true;
+ public boolean fixCuringZombieVillagerDiscountExploit = true;
+ public IntOr.Disabled fallingBlockHeightNerf = IntOr.Disabled.DISABLED;
+ public IntOr.Disabled tntEntityHeightNerf = IntOr.Disabled.DISABLED;
+ }