EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

More tweaks to Taming.

Browse Source
This commit is contained in:
GJ
2012-06-12 14:42:38 -04:00
parent 2d47447375
commit 5ba9fb78fd
10 changed files with 376 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gmail/nossr50/util/Combat.java
View File

@ -34,7 +34,6 @@ import com.gmail.nossr50.skills.combat.Archery;
import com.gmail.nossr50.skills.combat.Axes;
import com.gmail.nossr50.skills.combat.Swords;
import com.gmail.nossr50.skills.combat.Unarmed;
import com.gmail.nossr50.skills.taming.Taming;
import com.gmail.nossr50.skills.taming.TamingManager;
public class Combat {
@ -146,8 +145,10 @@ public class Combat {
startGainXp(attacker, PPa, target, SkillType.UNARMED);
}
else if (itemInHand.getType().equals(Material.BONE) && permInstance.beastLore(attacker)) {
Taming.beastLore(event, target, attacker);
else if (itemInHand.getType() == Material.BONE && target instanceof Tameable) {
TamingManager tamingManager = new TamingManager(attacker);
tamingManager.beastLore(target);
event.setCancelled(true);
}
}
else if (damager instanceof Wolf) {