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/0060-Disable-Scoreboards-for-non-players-by-default.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/0060-Disable-Scoreboards-for-non-players-by-default.patch')
| -rw-r--r-- | patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch index b0ec269133..fae95eea55 100644 --- a/patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch +++ b/patches/server/0060-Disable-Scoreboards-for-non-players-by-default.patch @@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team" logic which is most likely to be true. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 71c4b75901ca55e3e08fd59f0e906a0cc5334b89..4dc659760272a13fc8c0f05c543bed634784af6c 100644 +index 8444518356f32486ee4064446f8c1396276ad015..9fb52c98455d547bdde6d56689528e78a5ddfed5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2820,6 +2820,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -23,7 +23,7 @@ index 71c4b75901ca55e3e08fd59f0e906a0cc5334b89..4dc659760272a13fc8c0f05c543bed63 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5ae9f9a4cb903909cb26a612a847d12515c52d91..7f85da14097ad559e5a8f82474f7a71a078b3e77 100644 +index 13e8502640abad928282e4b1596f2ad97b4db765..99e91dd930bb33a006b2be3ad678df5861eb8eeb 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -841,6 +841,7 @@ public abstract class LivingEntity extends Entity implements Attackable { |