From 526795bacd07c019fe3652c96d74cc9f91ecb1fd Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Fri, 12 Apr 2024 12:14:06 -0700 Subject: 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 <11360596+jpenilla@users.noreply.github.com> --- patches/server/0034-Configurable-top-of-nether-void-damage.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'patches/server/0034-Configurable-top-of-nether-void-damage.patch') diff --git a/patches/server/0034-Configurable-top-of-nether-void-damage.patch b/patches/server/0034-Configurable-top-of-nether-void-damage.patch index e1dc631598..7885dcabd1 100644 --- a/patches/server/0034-Configurable-top-of-nether-void-damage.patch +++ b/patches/server/0034-Configurable-top-of-nether-void-damage.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable top of nether void damage Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c21c4d6df21bc9741f087ac4a328aad04b1cda38..60d94e4d8f69fb7ab8a94a926d18d38fe1c1d6c7 100644 +index 6f687387d8f817646dacf0e0373d50db8ee80dd5..c582d2f447384ca3b46c3b8159b7114d7efef52c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -683,7 +683,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S -- cgit v1.2.3