diff options
Diffstat (limited to 'patches/server/0850-More-Teleport-API.patch')
| -rw-r--r-- | patches/server/0850-More-Teleport-API.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/server/0850-More-Teleport-API.patch b/patches/server/0850-More-Teleport-API.patch index 22f17c94c0..391f9be147 100644 --- a/patches/server/0850-More-Teleport-API.patch +++ b/patches/server/0850-More-Teleport-API.patch @@ -74,10 +74,10 @@ index cc72d960d9a5f9481ec2214b1549a344907a68da..94b41e9e3abe9cfbe09af67b03bc841f // Let the server handle cross world teleports if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c949a3581581aa34a678d942fe38e660ba389eef..607c5797ee9d4c62ff5fbf1613d2ac08ec57d067 100644 +index 3120f72d2ba93625931da83c1e37678c07bd69cd..65e0a7e7b210107cd8882cc48da796c470b6eec4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1187,13 +1187,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1203,13 +1203,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setRotation(float yaw, float pitch) { @@ -180,7 +180,7 @@ index c949a3581581aa34a678d942fe38e660ba389eef..607c5797ee9d4c62ff5fbf1613d2ac08 location.checkFinite(); ServerPlayer entity = this.getHandle(); -@@ -1206,7 +1294,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1222,7 +1310,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return false; } @@ -189,7 +189,7 @@ index c949a3581581aa34a678d942fe38e660ba389eef..607c5797ee9d4c62ff5fbf1613d2ac08 return false; } -@@ -1224,7 +1312,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1240,7 +1328,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } // If this player is riding another entity, we must dismount before teleporting. @@ -198,7 +198,7 @@ index c949a3581581aa34a678d942fe38e660ba389eef..607c5797ee9d4c62ff5fbf1613d2ac08 // SPIGOT-5509: Wakeup, similar to riding if (this.isSleeping()) { -@@ -1240,13 +1328,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1256,13 +1344,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { ServerLevel toWorld = ((CraftWorld) to.getWorld()).getHandle(); // Close any foreign inventory |