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/0869-Add-BlockFace-to-BlockDamageEvent.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/0869-Add-BlockFace-to-BlockDamageEvent.patch')
| -rw-r--r-- | patches/server/0869-Add-BlockFace-to-BlockDamageEvent.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0869-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0869-Add-BlockFace-to-BlockDamageEvent.patch index 3a44f17ce6..28fdbf6dc6 100644 --- a/patches/server/0869-Add-BlockFace-to-BlockDamageEvent.patch +++ b/patches/server/0869-Add-BlockFace-to-BlockDamageEvent.patch @@ -18,10 +18,10 @@ index c680f081ba548f84f07a968a46811090c53e57e3..d839f8df658c894f144ba4637d290ffb if (blockEvent.isCancelled()) { // Let the client know the block still exists diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 3f9a309d4d0685aec0fabb16a1bd51931048525b..3dae4bc26ac6de7ee07eeca7763e2078cb2b7101 100644 +index 50346dda83472bddc043f8e8c45f9131c2e5958c..d80587afa3d0c8c5a0dd8112bbb73bc56ac1722d 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -659,13 +659,13 @@ public class CraftEventFactory { +@@ -661,13 +661,13 @@ public class CraftEventFactory { /** * BlockDamageEvent */ |