SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure portal search radius is used when teleporting players (#2877)

Browse Source 
Also add the create search radius mojang recently introduced
to config
This commit is contained in:
Spottedleaf
2020-01-18 09:28:32 -08:00
parent 0fcff54352
commit d6efbad797
54 changed files with 111 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/Configurable-inter-world-teleportation-safety.patch
View File

@@ -16,12 +16,12 @@ The wanted destination was on top of the emerald block however the player ended
This only is the case if the player is teleporting between worlds.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 5de4ec0521..ba16bcc319 100644
index cd47a4ca0..abbf59bb9 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
private void portalSearchRadius() {
portalSearchRadius = getInt("portal-search-radius", 128);
portalCreateRadius = getInt("portal-create-radius", 16);
}
+
+ public boolean disableTeleportationSuffocationCheck;
@@ -30,7 +30,7 @@ index 5de4ec0521..ba16bcc319 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c6624cf086..a80c0164a3 100644
index c6624cf08..a80c0164a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {