Fix incorrect tool detection on entity death

Flo56958 · Sep 28, 2023 · 4643688 · 4643688
1 parent 3f5dfc8
commit 4643688
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/de/flo56958/minetinker/listeners/EntityListener.java b/src/main/java/de/flo56958/minetinker/listeners/EntityListener.java
@@ -110,7 +110,16 @@ public void onDeath(@NotNull final EntityDeathEvent event) {
 			return;
 		}
 
-		final ItemStack tool = player.getInventory().getItemInMainHand();
+		ItemStack tool = player.getInventory().getItemInMainHand();
+		if (mob.getLastDamageCause() instanceof EntityDamageByEntityEvent lastevent) {
+			if (lastevent.getDamager() instanceof Arrow || lastevent.getDamager() instanceof Trident) {
+				List<MetadataValue> tools = lastevent.getDamager().getMetadata(MineTinker.getPlugin().getName() + "item");
+				FixedMetadataValue obj = (FixedMetadataValue) tools.get(0);
+				if (obj == null || !(obj.value() instanceof ItemStack t)) return;
+				tool = t;
+			}
+		}
+
 
 		if (!modManager.isToolViable(tool)) {
 			return;