Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-01-17 21:11:26 +01:00
Code Issues Projects Releases Wiki Activity

Catch random, unexplainable NPE in Inventory listeners when shutting

Browse Source 
down
This commit is contained in:
Evenprime 2012-01-04 14:26:13 +01:00
parent 83789e27c0
commit b10a02d424
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cc/co/evenprime/bukkit/nocheat/checks/inventory/InventoryEventManager.java
View File

@ -34,10 +34,14 @@ public class InventoryEventManager extends EventManagerImpl {
@Override
protected void handlePlayerTeleportEvent(final PlayerTeleportEvent event, final Priority priority) {
try {
NoCheatPlayer player = plugin.getPlayer(event.getPlayer());
if(InventoryCheck.getConfig(player.getConfigurationStore()).closebeforeteleports && event.getTo() != null && !(event.getTo().getWorld().equals(player.getPlayer().getWorld()))) {
player.closeInventory();
}
} catch(NullPointerException e) {
}
}
@Override
@ -61,16 +65,18 @@ public class InventoryEventManager extends EventManagerImpl {
}
}
if(cancelled)
if(cancelled) {
event.setCancelled(true);
player.closeInventory();
}
}
public List<String> getActiveChecks(ConfigurationCacheStore cc) {
LinkedList<String> s = new LinkedList<String>();
/*CCInventory i = InventoryCheck.getConfig(cc);
CCInventory i = InventoryCheck.getConfig(cc);
if(i.check && i.dropCheck)
s.add("inventory.dropCheck");*/
s.add("inventory.dropCheck");
return s;
}
}