🐛 Fix kill mob challenge not accepting player type

Author: MrCrayfish

common/src/main/java/com/mrcrayfish/backpacked/Bootstrap.java

@@ -44,7 +44,6 @@ public static void init()
         InteractWithBlockChallenge.Tracker.registerEvent();
         InteractWithEntityChallenge.Tracker.registerEvent();
         TravelDistanceChallenge.Tracker.registerEvent();
-        KillMobChallenge.Tracker.registerEvent();
         MineBlockChallenge.Tracker.registerEvent();
         CraftItemChallenge.Tracker.registerEvent();
         MerchantTradeChallenge.Tracker.registerEvent();

common/src/main/java/com/mrcrayfish/backpacked/common/challenge/impl/KillMobChallenge.java

@@ -14,6 +14,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.ExtraCodecs;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
@@ -81,24 +82,21 @@ private boolean test(LivingEntity entity, ItemStack stack, ServerPlayer player)
             return this.entityPredicate.map(p -> p.matches(player, entity)).orElse(true) && this.itemPredicate.map(p -> p.test(stack)).orElse(true);
         }
 
-        public static void registerEvent()
+        // Called via LivingEntityMixin and ServerPlayerMixin
+        public static void onLivingEntityDeath(LivingEntity entity, DamageSource source)
         {
-            EntityEvents.LIVING_ENTITY_DEATH.register((entity, source) -> {
-                if(entity.level().isClientSide())
-                    return false;
-
-                Entity cause = source.getEntity();
-                if(cause != null && cause.getType() == EntityType.PLAYER) {
-                    ServerPlayer player = (ServerPlayer) cause;
-                    UnlockManager.getIncompleteTrackers(player, Tracker.class).forEach(tracker -> {
-                        ItemStack heldItem = player.getMainHandItem();
-                        if(tracker.test(entity, heldItem, player)) {
-                            tracker.increment(player);
-                        }
-                    });
-                }
-                return false;
-            });
+            Entity cause = source.getEntity();
+            if(cause != null && cause.getType() == EntityType.PLAYER)
+            {
+                ServerPlayer player = (ServerPlayer) cause;
+                UnlockManager.getIncompleteTrackers(player, Tracker.class).forEach(tracker -> {
+                    ItemStack heldItem = player.getMainHandItem();
+                    if(tracker.test(entity, heldItem, player))
+                    {
+                        tracker.increment(player);
+                    }
+                });
+            }
         }
     }
 }

common/src/main/java/com/mrcrayfish/backpacked/mixin/common/LivingEntityMixin.java

@@ -4,18 +4,27 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mrcrayfish.backpacked.Config;
 import com.mrcrayfish.backpacked.common.augment.AugmentHandler;
+import com.mrcrayfish.backpacked.common.challenge.impl.KillMobChallenge;
 import com.mrcrayfish.backpacked.core.ModSyncedDataKeys;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LivingEntity.class)
 public class LivingEntityMixin
 {
+    @Shadow
+    protected boolean dead;
+
     @ModifyExpressionValue(method = "checkTotemDeathProtection", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;getItemInHand(Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack;"))
     private ItemStack backpacked$CheckBackpackForTotem(ItemStack original, @Local(ordinal = 0) InteractionHand hand)
     {
@@ -34,4 +43,14 @@ public class LivingEntityMixin
         }
         return original;
     }
+
+    @Inject(method = "die", at = @At(value = "TAIL"))
+    private void backpacked$OnDeath(DamageSource source, CallbackInfo ci)
+    {
+        LivingEntity entity = (LivingEntity) (Object) this;
+        if(this.dead && !entity.isRemoved() && !entity.level().isClientSide())
+        {
+            KillMobChallenge.Tracker.onLivingEntityDeath(entity, source);
+        }
+    }
 }

common/src/main/java/com/mrcrayfish/backpacked/mixin/common/ServerPlayerMixin.java

@@ -2,12 +2,14 @@
 
 import com.mrcrayfish.backpacked.common.MovementType;
 import com.mrcrayfish.backpacked.common.augment.AugmentHandler;
+import com.mrcrayfish.backpacked.common.challenge.impl.KillMobChallenge;
 import com.mrcrayfish.backpacked.event.BackpackedEvents;
 import com.mrcrayfish.backpacked.event.BackpackedInteractAccess;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
@@ -118,4 +120,11 @@ public abstract class ServerPlayerMixin implements BackpackedInteractAccess
         int brightness = level.getMaxLocalRawBrightness(pos);
         AugmentHandler.onPlayerChangedBlockPos(player, level, pos, brightness);
     }
+
+    @Inject(method = "die", at = @At(value = "TAIL"))
+    private void backpacked$OnDeath(DamageSource source, CallbackInfo ci)
+    {
+        ServerPlayer player = (ServerPlayer) (Object) this;
+        KillMobChallenge.Tracker.onLivingEntityDeath(player, source);
+    }
 }