EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Fixed combat exp gain when hitting a friendly wolf

Browse Source
This commit is contained in:
bm01 2013-02-19 02:06:31 +01:00
parent ad68f50b14
commit 29fb8b83c2
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java
View File

@ -69,6 +69,10 @@ public final class CombatTools {
return; return;
} }
if (target instanceof Tameable && isFriendlyPet(player, (Tameable) target)) {
return;
}
ItemStack heldItem = player.getItemInHand(); ItemStack heldItem = player.getItemInHand();
Material heldItemType = heldItem.getType(); Material heldItemType = heldItem.getType();
DamageCause damageCause = event.getCause(); DamageCause damageCause = event.getCause();