EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 10:14:43 +02:00
Code Issues Projects Releases Wiki Activity

Fixed bug where Beast Lore wouldn't work on friendly pets.

Browse Source 
Fixes #805
This commit is contained in:
GJ
2013-03-07 09:18:27 -05:00
parent 29520dc95c
commit ade9e20cdd
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -64,10 +64,6 @@ public final class CombatUtils {
ItemStack heldItem = player.getItemInHand();
if (target instanceof Tameable) {
if (isFriendlyPet(player, (Tameable) target)) {
return;
}
if (heldItem.getType() == Material.BONE) {
TamingManager tamingManager = mcMMOPlayer.getTamingManager();
@ -77,6 +73,10 @@ public final class CombatUtils {
return;
}
}
if (isFriendlyPet(player, (Tameable) target)) {
return;
}
}
if (ItemUtils.isSword(heldItem)) {