Upstream
/
Modifyworld
mirror of https://github.com/PEXPlugins/Modifyworld.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:PEXPlugins/Modifyworld

This commit is contained in:
t3hk0d3 2012-08-22 23:37:58 +04:00
parent 712e4cea66 3cc9b64d3f
commit c62222e324
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/tehkode/modifyworld/handlers/EntityListener.java
View File

@ -52,7 +52,7 @@ public class EntityListener extends ModifyworldListener {
if (edbe.getEntity() instanceof Player) {
player = (Player) edbe.getEntity();
if (edbe.getDamager() != null) { // Prevent from taking damage by entity
if (edbe.getDamager() != null && player.isOnline()) { // Prevent from taking damage by entity
if (_permissionDenied(player, "modifyworld.damage.take", edbe.getDamager())) {
cancelDamageEvent(player, event);
}

6
src/main/java/ru/tehkode/modifyworld/handlers/PlayerListener.java
View File

@ -249,7 +249,7 @@ public class PlayerListener extends ModifyworldListener {
Player player = event.getPlayer();
if (action == Action.RIGHT_CLICK_AIR) { //RIGHT_CLICK_AIR is cancelled by default.
if (action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK) { //RIGHT_CLICK_AIR is cancelled by default.
switch (player.getItemInHand().getType()) {
case POTION: //Only check splash potions.
if ((player.getItemInHand().getDurability() & 0x4000) != 0x4000) {
@ -265,7 +265,9 @@ public class PlayerListener extends ModifyworldListener {
event.getPlayer().updateInventory();
}
}
return;
if (action == Action.RIGHT_CLICK_AIR) {
return;
}
}
}