diff options
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Jails.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Jails.java b/Essentials/src/com/earth2me/essentials/Jails.java index 7353aee08..0aa90e08c 100644 --- a/Essentials/src/com/earth2me/essentials/Jails.java +++ b/Essentials/src/com/earth2me/essentials/Jails.java @@ -221,10 +221,13 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett return; } final Entity damager = event.getDamager(); - final User user = ess.getUser(damager); - if (user.isJailed()) + if (damager.getType() == EntityType.PLAYER) { - event.setCancelled(true); + final User user = ess.getUser(damager); + if (user != null && user.isJailed()) + { + event.setCancelled(true); + } } } |