EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 06:36:45 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -14,6 +14,7 @@ Version 1.4.03-dev
= Fixed bug where Fishing was becoming less successful at higher levels = Fixed bug where Fishing was becoming less successful at higher levels
= Fixed bug with using Salvage on stacked items. = Fixed bug with using Salvage on stacked items.
= Fixed bug where the 'mcmmo.commands.ptp.world.all' was registered twice = Fixed bug where the 'mcmmo.commands.ptp.world.all' was registered twice
= Fixed bug where Beast Lore wouldn't work on friendly pets
! Moved the Salvage unlock level from config.yml to advanced.yml ! Moved the Salvage unlock level from config.yml to advanced.yml
- Removed option to disable Salvage via the config file. This should be handled via permissions instead. - Removed option to disable Salvage via the config file. This should be handled via permissions instead.
- Removed the option to use Woodcutting without an axe from the config file. - Removed the option to use Woodcutting without an axe from the config file.

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