diff options
| author | Jake Potrebic <[email protected]> | 2024-04-12 12:14:06 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-04-12 12:14:06 -0700 |
| commit | 526795bacd07c019fe3652c96d74cc9f91ecb1fd (patch) | |
| tree | d1d57ba4f75f239030713ac504df570c25a244b8 /patches/server/0424-Add-methods-to-get-translation-keys.patch | |
| parent | 37db2d7e4c10510a39b083600befec5dfc7cfbd4 (diff) | |
| download | Paper-526795bacd07c019fe3652c96d74cc9f91ecb1fd.tar.gz Paper-526795bacd07c019fe3652c96d74cc9f91ecb1fd.zip | |
Update patches to handle vineflower decompiler (#10406)
* Update patches to handle vineflower decompiler
* update patches again to handle inlined simple lambdas
* update vf again and re-apply/rebuild patches
* update patches after removal of verify-merges flag
* fix compile issue
* remove maven local
* fix some issues
* address more issues
* fix collision patch
* use paperweight release
* more fixes
* update fineflower and fix patches again
* add missing comment descriptor
---------
Co-authored-by: Jason Penilla <[email protected]>
Diffstat (limited to 'patches/server/0424-Add-methods-to-get-translation-keys.patch')
| -rw-r--r-- | patches/server/0424-Add-methods-to-get-translation-keys.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/server/0424-Add-methods-to-get-translation-keys.patch b/patches/server/0424-Add-methods-to-get-translation-keys.patch index d602369647..26a527c94e 100644 --- a/patches/server/0424-Add-methods-to-get-translation-keys.patch +++ b/patches/server/0424-Add-methods-to-get-translation-keys.patch @@ -25,7 +25,7 @@ index f041b5d80bff9c022b007e04ef1558e9116acc6b..a586442422a2b2c06b785af0d261d3e1 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java -index f0f7fb977edb7e7009716429f007e44fa36bfcda..7aa4035a4df1ddcc71065034eafd569ca59be810 100644 +index f24b4732db849893fd870b4b6a49f1c4b3eacdec..3feaaca5aaee12e48fa2e5f5d05329c9980b161e 100644 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java @@ -152,6 +152,11 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine |