From 4823712f47bfb7f64e22b8633b05e3f6801919c5 Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Thu, 5 Apr 2012 13:28:23 +0100
Subject: Fixing up NPE bug in jails (implemented in Dev2.9.163)

---
 Essentials/src/com/earth2me/essentials/Jails.java | 9 ++++++---
 1 file 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);
+				}
 			}
 		}
 
-- 
cgit v1.2.3