mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@00ef8bd Fix Entity#isTicking and update Paper entity command (#11590) PaperMC/Paper@6483ecb Updated Upstream (Bukkit/CraftBukkit) PaperMC/Paper@17dbf74 Improve CraftEntity and CraftPlayer equals PaperMC/Paper@0af4e84 [ci skip] Add identifying line to some larger/optimization patches PaperMC/Paper@bcbd108 Call CraftPlayer#onEntityRemove for all online players (#11598) PaperMC/Paper@e47f79a Configure mockito agent (#11560) PaperMC/Paper@94ea770 Re-add exact choice shapeless support (#11546) PaperMC/Paper@2e6eafb Improve Minecart#getMinecartMaterial (#11544) PaperMC/Paper@9d1c91d [ci skip] Fix UseCooldownComponent jd (#11565) PaperMC/Paper@59b79c8 Fix NPE with enchantable (#11557) PaperMC/Paper@6da7b9e Update Eigencraft patch to 1.21.3 (#11553) PaperMC/Paper@1ef4c0e Improve performance of RecipeMap#removeRecipe (#11547)
This commit is contained in:
@@ -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 e970ecee6cbcf2c1597e1afb1cbaa39d85183ce6..48ad261eec1b74fad5a4fc1516b75fd2aaecd528 100644
|
||||
index b108738629f0b6aebdaa33a21808af2776ecd870..3ffd75c2547e1c113f65cf258ae6a9ce8d353fef 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1472,6 +1472,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1460,6 +1460,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
|
||||
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
|
||||
|
||||
Reference in New Issue
Block a user