Fixing up NPE bug in jails (implemented in Dev2.9.163)

This commit is contained in:
KHobbits 2012-04-05 13:28:23 +01:00
parent 08642ada20
commit aa43703094

View file

@ -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);
}
}
}