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

Fixed NPE with Beast Lore

Browse Source 
Fixes #1289
This commit is contained in:
TfT_02 2013-07-22 11:35:48 +02:00
parent be7992d541
commit bf2e527e72
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -12,6 +12,8 @@ Version 1.4.07-dev
+ Added new experience curve option. Cumulative curve, calculates experience needed for next level using power level. + Added new experience curve option. Cumulative curve, calculates experience needed for next level using power level.
= Fixed bug with Skull Splitter not finding the locale string = Fixed bug with Skull Splitter not finding the locale string
= Fixed issue where locale strings could cause the scoreboard header to be longer than 16 characters. = Fixed issue where locale strings could cause the scoreboard header to be longer than 16 characters.
= Fixed a bug with Beast Lore when the entity had no owner but was tamed.
= Fixed a bug where AbilityDeactivateEvent would throw an error if the player logged out before his ability ran out.
! Improved profile saving ! Improved profile saving
! Updated localization files ! Updated localization files

2
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@ -142,7 +142,7 @@ public class TamingManager extends SkillManager {
String message = LocaleLoader.getString("Combat.BeastLore") + " "; String message = LocaleLoader.getString("Combat.BeastLore") + " ";
if (beast.isTamed()) { if (beast.isTamed() && beast.getOwner() != null) {
message = message.concat(LocaleLoader.getString("Combat.BeastLoreOwner", beast.getOwner().getName()) + " "); message = message.concat(LocaleLoader.getString("Combat.BeastLoreOwner", beast.getOwner().getName()) + " ");
} }