Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-07 03:58:45 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
KHobbits 2012-04-05 13:28:23 +01:00
parent 08642ada20
commit aa43703094
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Essentials/src/com/earth2me/essentials/Jails.java
View File

@ -221,12 +221,15 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
return; return;
} }
final Entity damager = event.getDamager(); final Entity damager = event.getDamager();
if (damager.getType() == EntityType.PLAYER)
{
final User user = ess.getUser(damager); final User user = ess.getUser(damager);
if (user.isJailed()) if (user != null && user.isJailed())
{ {
event.setCancelled(true); event.setCancelled(true);
} }
} }
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerInteract(final PlayerInteractEvent event) public void onPlayerInteract(final PlayerInteractEvent event)