aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0055-Configurable-inter-world-teleportation-safety.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2022-07-27 19:07:26 -0700
committerGitHub <[email protected]>2022-07-27 19:07:26 -0700
commit4a4ee79cd6a70811e9d62c58abc5f3b6a8627f5c (patch)
tree4341bba04b9f19f67ac7c76dc0c270bf1b189bd4 /patches/server/0055-Configurable-inter-world-teleportation-safety.patch
parent71544ab01fbffcd2457deb4ae113cf735f14c0a4 (diff)
downloadPaper-4a4ee79cd6a70811e9d62c58abc5f3b6a8627f5c.tar.gz
Paper-4a4ee79cd6a70811e9d62c58abc5f3b6a8627f5c.zip
Separate out chat and commands sent via API (#8131)
Diffstat (limited to 'patches/server/0055-Configurable-inter-world-teleportation-safety.patch')
-rw-r--r--patches/server/0055-Configurable-inter-world-teleportation-safety.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0055-Configurable-inter-world-teleportation-safety.patch b/patches/server/0055-Configurable-inter-world-teleportation-safety.patch
index 83fb3dc2c8..5f2a39c0d7 100644
--- a/patches/server/0055-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0055-Configurable-inter-world-teleportation-safety.patch
@@ -16,10 +16,10 @@ 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/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 383168bc9af2174cbe6a0c914d0dbbc8b9d3d156..797c6f7e055cc2579db5f20b393f8011bc62eadb 100644
+index 97307be401ca8a5207aa7b96a6f7961f9fc76786..3794d05b17378ebf517199adbbfd54a395ef6b37 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1038,7 +1038,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1050,7 +1050,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (fromWorld == toWorld) {
entity.connection.teleport(to);
} else {