EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02: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
Download Patch File Download Diff File Expand all files Collapse all files

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();
Block block = event.getClickedBlock();
ItemStack is = player.getItemInHand();
Material mat = block.getType();
Material mat;
if (block.equals(null)) {
mat = Material.AIR;
}
else {
mat = block.getType();
}
/*
* 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();
Wolf wolf = (Wolf) event.getEntity();
Player master;
if ( wolf.getOwner() instanceof Player ) {
master = (Player) wolf.getOwner();
}
else {
OfflinePlayer oMaster = (OfflinePlayer) wolf.getOwner();
master = (Player) oMaster.getPlayer();
}
Player master = (Player) wolf.getOwner();
int skillLevel = Users.getProfile(master).getSkillLevel(SkillType.TAMING);
switch(cause)