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/api/0173-Fix-Spigot-annotation-mistakes.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/api/0173-Fix-Spigot-annotation-mistakes.patch')
| -rw-r--r-- | patches/api/0173-Fix-Spigot-annotation-mistakes.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch index daafa8ea7f..5a9e1829f9 100644 --- a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch @@ -848,7 +848,7 @@ index f124b35ec76e6cb6a1a0dc464005087043c3efd0..f50aaddf8582be55fd4860ad374d8f22 +@Deprecated(forRemoval = true) // Paper public interface LingeringPotion extends ThrownPotion { } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 6dbd3524af80adc9dd7a94444e668220d3fccaea..3e5b7dc8f72bd211a18ec6a930c4f02beea4205a 100644 +index d8ac9ce8e448f8b3bc39ec6c140db0e25d14cec7..2f9299f407692c51dca17ca38a6135dde259b895 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -716,7 +716,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource |