fix MC-219981 (#434)

* fix MC-219981

* use single expression rather than sugar and multiple handlers

---------

Co-authored-by: isxander <[email protected]>

Author: MicrocontrollersDev

PATCHED.md

@@ -98,6 +98,7 @@
 | Basic    | [MC-206922](https://bugs.mojang.com/browse/MC-206922) | Items dropped by entities that are killed by lightning instantly disappear                                                                     |
 | Basic    | [MC-214147](https://bugs.mojang.com/browse/MC-214147) | Skeletons wearing leather armor still convert to strays in powder snow                                                                         |
 | Basic    | [MC-215530](https://bugs.mojang.com/browse/MC-215530) | The freezing effect isn't immediately removed when switching into spectator mode                                                               |
+| Basic    | [MC-219981](https://bugs.mojang.com/browse/MC-219981) | If zombies spawned with max health over 20 (leader zombie bonus), they will have 20 health instead of their max health                         |
 | Basic    | [MC-221257](https://bugs.mojang.com/browse/MC-221257) | Shulker bullets don't produce bubble particles when moving through water                                                                       |
 | Basic    | [MC-223153](https://bugs.mojang.com/browse/MC-223153) | Block of Raw Copper uses stone sounds instead of copper sounds                                                                                 |
 | Basic    | [MC-224729](https://bugs.mojang.com/browse/MC-224729) | Partially generated chunks are not saved in some situations                                                                                    |

src/main/java/dev/isxander/debugify/mixins/basic/mc219981/ZombieMixin.java

@@ -0,0 +1,40 @@
+package dev.isxander.debugify.mixins.basic.mc219981;
+
+import com.llamalad7.mixinextras.expression.Definition;
+import com.llamalad7.mixinextras.expression.Expression;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import dev.isxander.debugify.fixes.BugFix;
+import dev.isxander.debugify.fixes.FixCategory;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.ai.attributes.AttributeInstance;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.world.entity.monster.Zombie;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@BugFix(id = "MC-219981", category = FixCategory.BASIC, env = BugFix.Env.SERVER, description = "If zombies spawned with max health over 20 (leader zombie bonus), they will have 20 health instead of their max health")
+@Mixin(Zombie.class)
+public class ZombieMixin extends Monster {
+    protected ZombieMixin(EntityType<? extends Monster> entityType, Level level) {
+        super(entityType, level);
+    }
+
+    @Definition(id = "getAttribute", method = "Lnet/minecraft/world/entity/monster/Zombie;getAttribute(Lnet/minecraft/core/Holder;)Lnet/minecraft/world/entity/ai/attributes/AttributeInstance;")
+    @Definition(id = "MAX_HEALTH", field = "Lnet/minecraft/world/entity/ai/attributes/Attributes;MAX_HEALTH:Lnet/minecraft/core/Holder;")
+    @Definition(id = "addOrReplacePermanentModifier", method = "Lnet/minecraft/world/entity/ai/attributes/AttributeInstance;addOrReplacePermanentModifier(Lnet/minecraft/world/entity/ai/attributes/AttributeModifier;)V")
+    @Definition(id = "LEADER_ZOMBIE_BONUS_ID", field = "Lnet/minecraft/world/entity/monster/Zombie;LEADER_ZOMBIE_BONUS_ID:Lnet/minecraft/resources/ResourceLocation;")
+    @Definition(id = "AttributeModifier", type = AttributeModifier.class)
+    @Expression("this.getAttribute(MAX_HEALTH).addOrReplacePermanentModifier(new AttributeModifier(LEADER_ZOMBIE_BONUS_ID, ?, ?))")
+    @WrapOperation(method = "handleAttributes", at = @At("MIXINEXTRAS:EXPRESSION"))
+    private void fixLeaderZombieHealth(AttributeInstance instance, AttributeModifier modifier, Operation<Void> original) {
+        float damageTaken = this.getMaxHealth() - this.getHealth();
+
+        // apply attribute, max health will increase
+        original.call(instance, modifier);
+
+        this.setHealth(this.getMaxHealth() - damageTaken);
+    }
+}

src/main/resources/assets/debugify/lang/en_us.json

@@ -82,6 +82,7 @@
   "debugify.fix_explanation.mc-200418": "Dismounts baby villagers from chickens upon conversion.",
   "debugify.fix_explanation.mc-206922": "Items with an age less than 9 ticks are not removed from lightning strikes.",
   "debugify.fix_explanation.mc-215530": "Resets frozen time when the player changes to spectator.",
+  "debugify.fix_explanation.mc-219981": "Sets the zombie's health to its new max health minus whatever damage it has taken.",
   "debugify.fix_explanation.mc-224729": "Always saves ProtoChunks even if the chunk save predicate returns false.",
   "debugify.fix_explanation.mc-226961": "Uses XP Orbs' eye height to determine if it is inside lava.",
   "debugify.fix_effect.mc-226961": "XP Orbs are killed shortly upon touching lava instead of bouncing.",

src/main/resources/debugify.mixins.json

@@ -45,6 +45,7 @@
     "basic.mc206922.ItemEntityMixin",
     "basic.mc215530.ServerPlayerMixin",
     "basic.mc221257.ShulkerBulletMixin",
+    "basic.mc219981.ZombieMixin",
     "basic.mc223153.BlocksMixin",
     "basic.mc224729.ChunkMapMixin",
     "basic.mc227008.EnderManMixin",