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/0406-Add-methods-to-get-translation-keys.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/0406-Add-methods-to-get-translation-keys.patch')
| -rw-r--r-- | patches/server/0406-Add-methods-to-get-translation-keys.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0406-Add-methods-to-get-translation-keys.patch b/patches/server/0406-Add-methods-to-get-translation-keys.patch index b6719466b9..e8e4f5ac2d 100644 --- a/patches/server/0406-Add-methods-to-get-translation-keys.patch +++ b/patches/server/0406-Add-methods-to-get-translation-keys.patch @@ -74,10 +74,10 @@ index d20fdd4f06faa09c7d9f9e04f379cf0fa68db9bb..66d773cadb74f9176e6cf68a56556803 + // Paper end - add Translatable } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java -index 305eac6845119c36d041bf75930eb0909405911c..8c1d2d0521da52f9a1262f5433da21700b9b0454 100644 +index 56dad5ebba54642e783146f1233d6ef44bb866a5..8725cd736d255b070f9f8ce7cf47b21e2407fbdd 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java -@@ -110,7 +110,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta { +@@ -123,7 +123,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta { return new FireworkExplosion(CraftMetaFirework.getNBT(effect.getType()), colors, fadeColors, effect.hasTrail(), effect.hasFlicker()); } |