diff options
| author | Nassim Jahnke <[email protected]> | 2023-07-04 10:22:56 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-07-04 10:22:56 +0200 |
| commit | c0936a71bd762a5a87425a24cfb9daff7418a4d4 (patch) | |
| tree | e0fdbf09ef0ac1ae127f76a03bd8bb5132fa5c54 /patches/server/0059-Configurable-inter-world-teleportation-safety.patch | |
| parent | 4356758b645f3d4d91268ac40cd3b682eb3faecf (diff) | |
| download | Paper-c0936a71bd762a5a87425a24cfb9daff7418a4d4.tar.gz Paper-c0936a71bd762a5a87425a24cfb9daff7418a4d4.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
01aa02eb PR-858: Add LivingEntity#playHurtAnimation()
9421320f PR-884: Refinements to new ban API for improved compatibility and correctness
37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API
4eeb174b All smithing inventories are now the new smithing inventory
f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop
e7a807fa PR-879: Add Player#sendHealthUpdate()
692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml
2d033390 SPIGOT-7403: Add direct API for waxed signs
16a08373 PR-876: Add missing Raider API and 'no action ticks'
CraftBukkit Changes:
b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation()
95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities
0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness
0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit
648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API
31fe848d6 All smithing inventories are now the new smithing inventory
9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table
9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop
3be9ac171 PR-1220: Add Player#sendHealthUpdate()
c1279f775 PR-1209: Clean up various patches
c432e4397 Fix Raider#setCelebrating() implementation
504d96665 SPIGOT-7403: Add direct API for waxed signs
c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks'
85b89c3dd Increase outdated build delay
Spigot Changes:
9ebce8af Rebuild patches
64b565e6 Rebuild patches
Diffstat (limited to 'patches/server/0059-Configurable-inter-world-teleportation-safety.patch')
| -rw-r--r-- | patches/server/0059-Configurable-inter-world-teleportation-safety.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch index 3491448922..a6d5ccab2c 100644 --- a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch +++ b/patches/server/0059-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 8b611525f74ed39601f64ad964aacffeebe503e8..a926c170fa1dbc4d8e16666ddd486f8c5ff5acf5 100644 +index 268cd764c1543a9a7e43013f47a81aaa5a55d108..78d31da062792c12f069e929ebe89ab5a624b7d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1152,7 +1152,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1158,7 +1158,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { entity.connection.teleport(to); } else { // The respawn reason should never be used if the passed location is non null. |