Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f4741f2 Expose particle status client option (#11573)
PaperMC/Paper@7e789e8 Prevent duplicate/superfluous BlockPhysicsEvent (#11609)
This commit is contained in:
granny
2024-11-26 18:34:29 -08:00
parent 420a1cea2d
commit 2b6f273aa7
12 changed files with 33 additions and 33 deletions

View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Fire EntityTeleportHinderedEvent when attempting to teleport
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b108738629f0b6aebdaa33a21808af2776ecd870..3ffd75c2547e1c113f65cf258ae6a9ce8d353fef 100644
index 68afb2464069f1ee8220df6d4e474be45d0ce8ef..49f69a42dbf35ac812b5bd53f395c3de8b332c19 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1460,6 +1460,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1462,6 +1462,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API