Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4d44b5fd Remove @Experimental annotation from the org.bukkit.damage package (#12898)
PaperMC/Paper@4f79e9ee [ci/skip] no need to ever import non-library files ever again (#12765)
PaperMC/Paper@a4da45e3 Fix typo in give command (#12905)
PaperMC/Paper@ec9c83fa Adventure 4.24.0 (#12908)
PaperMC/Paper@0c8efe4d [ci/skip] Remove redundant adventure version specification
PaperMC/Paper@ed31825a HIDE_ADDITIONAL_TOOLTIP backwards compat. not hiding disc names (#12900)
This commit is contained in:
granny
2025-07-30 21:58:10 -07:00
parent 520a7e500d
commit c29e75fe5e
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
purpur-server/paper-patches/features/0004-Add-EntityTeleportHinderedEvent.patch
View File

@@ -29,10 +29,10 @@ index edc1758f12b36555edb7eaba2ea3bd78118dda93..7a9e20699a8a5e95910ed15eb6cd1192
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2b17b3b51bd4ccd431e7cc959cc42795dfb2c1b8..54fbe5006c2c240937efb6fc89cf08b72637b9e5 100644
index eb53bc8c56c9b7dcfa051da06e9ffbe837978dac..4e24a177aed7eda0899b4a1a1e308f02a16c5718 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1459,6 +1459,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
@@ -1460,6 +1460,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
// Paper start - Teleport passenger API
// Don't allow teleporting between worlds while keeping passengers
if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {
@@ -40,7 +40,7 @@ index 2b17b3b51bd4ccd431e7cc959cc42795dfb2c1b8..54fbe5006c2c240937efb6fc89cf08b7
return false;
}
@@ -1480,6 +1481,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
@@ -1481,6 +1482,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API