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/0054-Be-a-bit-more-informative-in-maxHealth-exception.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/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch')
| -rw-r--r-- | patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch index aadcfbc397..619d3c8665 100644 --- a/patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/patches/server/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index bcab4757869428e20c67907684e02b64d2958e88..a73a5a8291ddd954f2c7b73a4895933e715c5d68 100644 +index 68c2825c2d43b3c949cc4b08035b0f5d277f34f2..844a97b0eb396835ec72b4d14c9362a2ea2a8709 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -102,7 +102,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { |