diff options
| author | Jake Potrebic <[email protected]> | 2024-08-17 12:39:11 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-08-17 12:39:11 -0700 |
| commit | 0e7361704a16c8386d829c26603f3e5c0bf72b39 (patch) | |
| tree | 1b6be3f26cc43bf2a36eb014ccb01b65a3737f6b /patches/server/0677-More-Projectile-API.patch | |
| parent | 75655ec1d34f344c7b0ba9f31f2ada87951d277d (diff) | |
| download | Paper-0e7361704a16c8386d829c26603f3e5c0bf72b39.tar.gz Paper-0e7361704a16c8386d829c26603f3e5c0bf72b39.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11284)
Updated Upstream (Bukkit/CraftBukkit/Spigot)
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:
4068c6aa PR-1053: Change docs for max power in FireworkMeta
6b3c241b SPIGOT-7783, SPIGOT-7784, PR-1051: Add Trial Vault & Spawner event API
5fe300ec PR-1052: Fix broken links and minor improvement for checkstyle.xml
CraftBukkit Changes:
7548afcf2 SPIGOT-7872: Fix crash with event-modified teleports
93480d5d6 SPIGOT-7868, PR-1463: Fix default and max power in FireworkMeta
5060d1a84 SPIGOT-7783, SPIGOT-7784, PR-1460: Add Trial Vault & Spawner event API
11dfcae71 PR-1462: Fix broken links and minor improvement for checkstyle.xml
Spigot Changes:
ca581228 Rebuild patches
Diffstat (limited to 'patches/server/0677-More-Projectile-API.patch')
| -rw-r--r-- | patches/server/0677-More-Projectile-API.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0677-More-Projectile-API.patch b/patches/server/0677-More-Projectile-API.patch index 3d4ddc9624..280d31b759 100644 --- a/patches/server/0677-More-Projectile-API.patch +++ b/patches/server/0677-More-Projectile-API.patch @@ -713,10 +713,10 @@ index e374b9f40eddca13b30855d25a2030f8df98138f..4fc893378fb0568ddcffc7593d66df6b // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 48f320333fa859796f4fff01f721fda903238197..9c85cbc65bf7e1f539f12644ed391c98118c08d2 100644 +index 03a6ca13218d43ad0c5fc461564d004008ee3e06..6aa954c168e5503c1e4cf069e13f518da277cdef 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -841,19 +841,19 @@ public class CraftEventFactory { +@@ -843,19 +843,19 @@ public class CraftEventFactory { /** * PotionSplashEvent */ @@ -739,7 +739,7 @@ index 48f320333fa859796f4fff01f721fda903238197..9c85cbc65bf7e1f539f12644ed391c98 hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity(); } -@@ -862,20 +862,20 @@ public class CraftEventFactory { +@@ -864,20 +864,20 @@ public class CraftEventFactory { return event; } |