From ad1642d1cd8f34d6020d829fc484dd8873994191 Mon Sep 17 00:00:00 2001 From: "Alex \"mcmonkey\" Goodwin" Date: Tue, 12 Dec 2023 11:14:12 -0800 Subject: [PATCH] fix autoswitch visual update for non-player NPCs --- src/main/java/org/mcmonkey/sentinel/SentinelItemHelper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelItemHelper.java b/src/main/java/org/mcmonkey/sentinel/SentinelItemHelper.java index ed2b8ca..3eebac8 100644 --- a/src/main/java/org/mcmonkey/sentinel/SentinelItemHelper.java +++ b/src/main/java/org/mcmonkey/sentinel/SentinelItemHelper.java @@ -221,6 +221,10 @@ public void swapToMatch(Function doSwap, boolean isRanged) { items[0] = items[bestIndex] == null ? null : items[bestIndex].clone(); items[bestIndex] = held == null ? null : held.clone(); inv.setContents(items); + if (!(sentinel.getLivingEntity() instanceof Player)) { + // Patch for non-player NPCs doing equipment differenty + sentinel.getLivingEntity().getEquipment().setItemInMainHand(items[0]); + } if (sentinel.getLivingEntity() instanceof Player && bestIndex == 40 && SentinelVersionCompat.v1_9 && sentinel.getLivingEntity().getEquipment() != null) { // Patch for offhand, which is "in the inventory" but not really tracked through it sentinel.getLivingEntity().getEquipment().setItemInOffHand(items[bestIndex]);