@@ -487,10 +487,10 @@ index 0000000000000000000000000000000000000000..d9502ba028a96f9cc846f9ed428bd806
487487+ }
488488diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
489489new file mode 100644
490- index 0000000000000000000000000000000000000000..f0d470d7770e119f734b9e72021c806d0ea8ecbd
490+ index 0000000000000000000000000000000000000000..b3d2dc8f7bd7b79d006aa76b4ff51d1afad6e1f8
491491--- /dev/null
492492+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
493- @@ -0,0 +1,330 @@
493+ @@ -0,0 +1,328 @@
494494+ package io.papermc.paper.configuration;
495495+
496496+ import com.mojang.logging.LogUtils;
@@ -655,8 +655,6 @@ index 0000000000000000000000000000000000000000..f0d470d7770e119f734b9e72021c806d
655655+ public UnsupportedSettings unsupportedSettings;
656656+
657657+ public class UnsupportedSettings extends ConfigurationPart {
658- + @Comment("This setting controls if the broken behavior of disarmed tripwires not breaking should be allowed. This also allows for dupes")
659- + public boolean allowTripwireDisarmingExploits = false;
660658+ @Comment("This setting allows for exploits related to end portals, for example sand duping")
661659+ public boolean allowUnsafeEndPortalTeleportation = false;
662660+ @Comment("This setting controls if players should be able to break bedrock, end portals and other intended to be permanent blocks.")
@@ -5226,7 +5224,7 @@ index 9cf0c141fefe67893828e300cba4f8a8545ba25f..c8e49c1904c80c4ede40ca5c26efad9b
52265224 this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
52275225
52285226diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
5229- index 60805f6a2badca9b9cdfa54a9273ceba6311b16c..6c8a69b7c1b45549b2c388a8df2258184c587309 100644
5227+ index 46b067fdfbbdeb3c0005b37d24ae248ec2d6bb90..d5451cb1976ca3675dd19b07bd8a2d363f82db86 100644
52305228--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
52315229+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
52325230@@ -967,6 +967,7 @@ public final class CraftServer implements Server {
@@ -5238,7 +5236,7 @@ index 60805f6a2badca9b9cdfa54a9273ceba6311b16c..6c8a69b7c1b45549b2c388a8df225818
52385236 world.serverLevelData.setDifficulty(config.difficulty);
52395237 world.setSpawnSettings(config.spawnMonsters);
52405238diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
5241- index 17e10c4373b4281cc74b748c4a1e173e36eb9196..755b1d77418ecae0dc9ec5197275d0cd914e7bee 100644
5239+ index 5e75839c0620f94e5b58942c984938e564d3b936..3ee69736494467aa6a1450baf868e73c94733e5b 100644
52425240--- a/src/main/java/org/bukkit/craftbukkit/Main.java
52435241+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
52445242@@ -142,6 +142,19 @@ public class Main {
0 commit comments