diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-04-05 13:28:23 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-04-05 13:28:23 +0100 |
| commit | 4823712f47bfb7f64e22b8633b05e3f6801919c5 (patch) | |
| tree | 0135abe691128f6c0cf3ff054235576fd5df75c8 | |
| parent | 9cb45a0a1572af38cc961ff5d29cbc6d21807cd4 (diff) | |
| download | Essentials-4823712f47bfb7f64e22b8633b05e3f6801919c5.tar Essentials-4823712f47bfb7f64e22b8633b05e3f6801919c5.tar.gz Essentials-4823712f47bfb7f64e22b8633b05e3f6801919c5.tar.lz Essentials-4823712f47bfb7f64e22b8633b05e3f6801919c5.tar.xz Essentials-4823712f47bfb7f64e22b8633b05e3f6801919c5.zip | |
Fixing up NPE bug in jails (implemented in Dev2.9.163)
| -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); + } } } |