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

Undo Taming fix, attempt fix of block interact NPE

Browse Source
This commit is contained in:
TheYeti 2012-03-08 12:11:09 -08:00
parent 714f829f3e
commit 88ab232ccd
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -16,7 +16,7 @@ Version 2.0.00-dev
= Fixed issue with Blast Mining not seeing TNT for detonation due to snow = Fixed issue with Blast Mining not seeing TNT for detonation due to snow
! Changed Call of the Wild to activate on left-click rather than right-click ! Changed Call of the Wild to activate on left-click rather than right-click
! Changed Blast Mining to track based on Entity ID vs. Location ! Changed Blast Mining to track based on Entity ID vs. Location
= Fix Taming to hopefully properly handle offline players....again = Attempted fix of block interaction returning NPE's
Version 1.3.02 Version 1.3.02
+ Added in game guides for Mining, Excavation, and Acrobatics. Simply type /skillname ? to access them + Added in game guides for Mining, Excavation, and Acrobatics. Simply type /skillname ? to access them

8
src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
View File

@ -156,7 +156,13 @@ public class mcPlayerListener implements Listener
Action action = event.getAction(); Action action = event.getAction();
Block block = event.getClickedBlock(); Block block = event.getClickedBlock();
ItemStack is = player.getItemInHand(); ItemStack is = player.getItemInHand();
Material mat = block.getType(); Material mat;
if (block.equals(null)) {
mat = Material.AIR;
}
else {
mat = block.getType();
}
/* /*
* Ability checks * Ability checks

9
src/main/java/com/gmail/nossr50/skills/Taming.java
View File

@ -104,14 +104,7 @@ public class Taming
{ {
DamageCause cause = event.getCause(); DamageCause cause = event.getCause();
Wolf wolf = (Wolf) event.getEntity(); Wolf wolf = (Wolf) event.getEntity();
Player master; Player master = (Player) wolf.getOwner();
if ( wolf.getOwner() instanceof Player ) {
master = (Player) wolf.getOwner();
}
else {
OfflinePlayer oMaster = (OfflinePlayer) wolf.getOwner();
master = (Player) oMaster.getPlayer();
}
int skillLevel = Users.getProfile(master).getSkillLevel(SkillType.TAMING); int skillLevel = Users.getProfile(master).getSkillLevel(SkillType.TAMING);
switch(cause) switch(cause)