Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +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@9e7f6c3 Fixup and deprecate player profiles in ping event (#10880)
PaperMC/Paper@5914f60 Update AbstractArrow item method implementations for 1.20.6 (#10885)
PaperMC/Paper@3889ffb Fix Player#sendBlockUpdate (#10855)
PaperMC/Paper@af7f0c4 Fix ItemMeta#removeEnchantments (#10886)
PaperMC/Paper@43484eb Add back RecipeIterator fixes patch (#10887)
PaperMC/Paper@fe7043e Configurable damage tick when blocking with shield (#10877)
PaperMC/Paper@122c9d3 Fix NPE in V3808
PaperMC/Paper@e41d44f Fix `hasFiredAsync` parameter when `AsyncPlayerSendCommandsEvent` is called (#10896)
This commit is contained in:
granny
2024-06-17 20:56:52 -07:00
parent f1c87e4fee
commit 0d6766e21d
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0120-Add-EntityTeleportHinderedEvent.patch
View File

@@ -89,10 +89,10 @@ index a6268b3df9691278606501284b5504da718703c2..befe3372d5f1550b7bde3b63b5e7aef9
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a4e4babedbf5bbf09bfbabd4f55ecd6301dae302..925b8260bb2b1c94e544d6e082ea3b02e613d224 100644
index 35635eb9f0315b7db3d176fcd0912fbe9309b4ef..e44f1331c82d76ac1a72f93205cf3fe68d20230f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1443,6 +1443,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1444,6 +1444,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
@@ -104,7 +104,7 @@ index a4e4babedbf5bbf09bfbabd4f55ecd6301dae302..925b8260bb2b1c94e544d6e082ea3b02
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 30a95d4b18964c6b25beb4dbec84f03effc2145b..bed0ee3cac8d2acda872f5f3fcbd2b75a6ca3a0d 100644
index 818d6c507faea7b8b640e0e7eeecf92fc99310b0..3bbe2d4397de4a3befd3a70c4215d283a6fa32d3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -117,6 +117,7 @@ public class PurpurWorldConfig {