From e7b7f7982cd46ac40526c9b48eed8d8370c27b62 Mon Sep 17 00:00:00 2001 From: Badfoxrox <76190553+Badfoxrox@users.noreply.github.com> Date: Mon, 22 Apr 2024 16:51:02 -0600 Subject: [PATCH 1/3] Update GraveManager.java --- src/main/java/com/ranull/graves/manager/GraveManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ranull/graves/manager/GraveManager.java b/src/main/java/com/ranull/graves/manager/GraveManager.java index 8202a21..214eada 100644 --- a/src/main/java/com/ranull/graves/manager/GraveManager.java +++ b/src/main/java/com/ranull/graves/manager/GraveManager.java @@ -662,7 +662,9 @@ public void autoLootGrave(Entity entity, Location location, Grave grave) { player.getInventory().setItem(counter, itemStack); grave.getInventory().remove(itemStack); - if ((counter == 39 && InventoryUtil.isHelmet(itemStack)) + // Added Shield and Torches to be auto looted + if ((counter == 40 && InventoryUtil.isOffhandItem(itemStack)) + || (counter == 39 && InventoryUtil.isHelmet(itemStack)) || (counter == 38 && InventoryUtil.isChestplate(itemStack)) || (counter == 37 && InventoryUtil.isLeggings(itemStack)) || (counter == 36 && InventoryUtil.isBoots(itemStack))) { From cd3bc47be7d3a098523a8ca5960cada4f011566f Mon Sep 17 00:00:00 2001 From: Badfoxrox <76190553+Badfoxrox@users.noreply.github.com> Date: Mon, 22 Apr 2024 16:54:27 -0600 Subject: [PATCH 2/3] Update InventoryUtil.java --- src/main/java/com/ranull/graves/util/InventoryUtil.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/ranull/graves/util/InventoryUtil.java b/src/main/java/com/ranull/graves/util/InventoryUtil.java index cdf1e2e..e97a2da 100644 --- a/src/main/java/com/ranull/graves/util/InventoryUtil.java +++ b/src/main/java/com/ranull/graves/util/InventoryUtil.java @@ -56,6 +56,11 @@ public static void equipArmor(Inventory inventory, Player player) { playArmorEquipSound(player, itemStack); inventory.removeItem(itemStack); } + + if(player.getInventory().getItemInOffHand().getType().isAir() && isOffhandItem(itemStack)) { + player.getInventory().setItemInOffHand(itemStack); + inventory.removeItem(itemStack); + } } } } From d910508bf7ac6229588a8fc4279c00f46e9dee4d Mon Sep 17 00:00:00 2001 From: Badfoxrox <76190553+Badfoxrox@users.noreply.github.com> Date: Mon, 22 Apr 2024 17:14:06 -0600 Subject: [PATCH 3/3] Update InventoryUtil.java --- src/main/java/com/ranull/graves/util/InventoryUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/ranull/graves/util/InventoryUtil.java b/src/main/java/com/ranull/graves/util/InventoryUtil.java index e97a2da..0ddfd1e 100644 --- a/src/main/java/com/ranull/graves/util/InventoryUtil.java +++ b/src/main/java/com/ranull/graves/util/InventoryUtil.java @@ -137,6 +137,10 @@ public static boolean isBoots(ItemStack itemStack) { "CHAINMAIL_BOOTS"); } + public static boolean isOffhandItem(ItemStack itemStack) { + return itemStack != null && itemStack.getType().name().matches("(?i)SHIELD|TORCH"); + } + public static String inventoryToString(Inventory inventory) { List stringList = new ArrayList<>();