Anura/AnuraCore
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Remove level debug message

Browse Source 
- Try to prevent null pointer
- Allow door right click
- Prevent destroying of soil
This commit is contained in:
kaenganxt
2014-12-20 22:07:24 +01:00
parent 6b0a6e738e
commit f7190f70ca
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/de/anura/core/API/Level.java
View File

@@ -122,7 +122,6 @@ public final class Level {
} }
level += (double) (maxSmashLevel / 4); level += (double) (maxSmashLevel / 4);
level += (double) maxFFLevel; level += (double) maxFFLevel;
System.out.println(level);
anuraLevel.put(P, (int) level); anuraLevel.put(P, (int) level);
smashLevel.put(P, (int) sLevel); smashLevel.put(P, (int) sLevel);
ffLevel.put(P, (int) fLevel); ffLevel.put(P, (int) fLevel);

2
src/de/anura/core/commands/PlayerCommands.java
View File

@@ -43,7 +43,7 @@ public class PlayerCommands implements CommandExecutor {
Core.statusMsg(sender, "only_player_cmd", false); Core.statusMsg(sender, "only_player_cmd", false);
return true; return true;
} }
if (Core.getMainClass().getFeatures().featureEnabled.get(P).get(Features.Feature.BOAT)) { if (Core.getMainClass().getFeatures().hasFeature(P, Features.Feature.BOAT) && Core.getMainClass().getFeatures().featureEnabled.get(P).get(Features.Feature.BOAT)) {
Core.getMainClass().getFeatures().disableFeature(P, Features.Feature.BOAT); Core.getMainClass().getFeatures().disableFeature(P, Features.Feature.BOAT);
} else { } else {
Core.getMainClass().getFeatures().enableFeature(P, Features.Feature.BOAT); Core.getMainClass().getFeatures().enableFeature(P, Features.Feature.BOAT);

8
src/de/anura/core/events/PlayerInteract.java
View File

@@ -153,10 +153,16 @@ public class PlayerInteract implements Listener {
cancelled = false; cancelled = false;
} else if (event.getClickedBlock().getType().equals(Material.WOOD_BUTTON)) { } else if (event.getClickedBlock().getType().equals(Material.WOOD_BUTTON)) {
cancelled = false; cancelled = false;
} else if (event.getClickedBlock().getType().equals(Material.WOODEN_DOOR)) {
cancelled = false;
} }
} else if (event.getAction().equals(Action.PHYSICAL)) { } else if (event.getAction().equals(Action.PHYSICAL)) {
cancelled = false; if (event.getClickedBlock().getType() != Material.SOIL) {
cancelled = false;
}
} else if (event.getAction().equals(Action.RIGHT_CLICK_AIR)) { } else if (event.getAction().equals(Action.RIGHT_CLICK_AIR)) {
}
if (event.getAction().equals(Action.RIGHT_CLICK_AIR) || event.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
if (event.getPlayer().getItemInHand().getType().equals(Material.BOW)) { if (event.getPlayer().getItemInHand().getType().equals(Material.BOW)) {
cancelled = false; cancelled = false;
} else if (event.getPlayer().getItemInHand().getType().equals(Material.EXP_BOTTLE)) { } else if (event.getPlayer().getItemInHand().getType().equals(Material.EXP_BOTTLE)) {