From 29fb8b83c2049a174f04c4b190fdd010673092a5 Mon Sep 17 00:00:00 2001 From: bm01 Date: Tue, 19 Feb 2013 02:06:31 +0100 Subject: [PATCH] Fixed combat exp gain when hitting a friendly wolf --- .../java/com/gmail/nossr50/skills/utilities/CombatTools.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java b/src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java index 54b1fa1ad..66de57972 100644 --- a/src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java +++ b/src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java @@ -69,6 +69,10 @@ public final class CombatTools { return; } + if (target instanceof Tameable && isFriendlyPet(player, (Tameable) target)) { + return; + } + ItemStack heldItem = player.getItemInHand(); Material heldItemType = heldItem.getType(); DamageCause damageCause = event.getCause();