From 946314fb5869b9c1f2e5c29ebc7ff0f8bb1ff4fe Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Wed, 25 Dec 2024 21:20:21 +0100
Subject: [PATCH] Remove disableTeleportationSuffocationCheck config (#11822)

---
 .../io/papermc/paper/configuration/RemovedConfigurations.java  | 3 ++-
 .../io/papermc/paper/configuration/WorldConfiguration.java     | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/paper-server/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java b/paper-server/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
index f9a4bb664..fad321217 100644
--- a/paper-server/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
+++ b/paper-server/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
@@ -53,7 +53,8 @@ interface RemovedConfigurations {
         path("entities", "spawning", "despawn-ranges", "hard"),
         path("fixes", "fix-curing-zombie-villager-discount-exploit"),
         path("entities", "mob-effects", "undead-immune-to-certain-effects"),
-        path("entities", "entities-target-with-follow-range")
+        path("entities", "entities-target-with-follow-range"),
+        path("environment", "disable-teleportation-suffocation-check")
     };
     // spawn.keep-spawn-loaded and spawn.keep-spawn-loaded-range are no longer used, but kept
     // in the world default config for compatibility with old worlds being migrated to use the gamerule
diff --git a/paper-server/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/paper-server/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
index b1c917d65..f5ac1b029 100644
--- a/paper-server/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+++ b/paper-server/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -445,7 +445,6 @@ public class WorldConfiguration extends ConfigurationPart {
         public int portalSearchRadius = 128;
         public int portalCreateRadius = 16;
         public boolean portalSearchVanillaDimensionScaling = true;
-        public boolean disableTeleportationSuffocationCheck = false;
         public IntOr.Disabled netherCeilingVoidDamageHeight = IntOr.Disabled.DISABLED;
         public int maxFluidTicks = 65536;
         public int maxBlockTicks = 65536;