Fix exceptions

This commit is contained in:
samczsun 2016-06-18 17:09:48 -04:00
parent d739df8623
commit 2e1bb25b0b
No known key found for this signature in database
GPG Key ID: B0AFDBD87206805D
3 changed files with 4 additions and 3 deletions

View File

@ -242,6 +242,7 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
_condition = new SkillConditionManager(plugin); _condition = new SkillConditionManager(plugin);
_damageManager = new DamageManager(plugin, _combatManager, _npcManager, _disguiseManager, _condition); _damageManager = new DamageManager(plugin, _combatManager, _npcManager, _disguiseManager, _condition);
_damageManager.addCommand(new KillCommand(_damageManager)); _damageManager.addCommand(new KillCommand(_damageManager));
_condition.setDamageManager(_damageManager);
_worldEvent = new WorldEventManager(plugin, this, _damageManager, _lootManager, blockRestore, _clanRegions, null); _worldEvent = new WorldEventManager(plugin, this, _damageManager, _lootManager, blockRestore, _clanRegions, null);

View File

@ -488,8 +488,8 @@ public class ItemMapManager extends MiniPlugin
} }
else else
{ {
System.out.println(String.format("Tried to set color to %s in colorWorldHeight scale: %s, sx: %s, sz: %s, x: %z, z: %s, zoom: %s", // System.out.println(String.format("Tried to set color to %s in colorWorldHeight scale: %s, sx: %s, sz: %s, x: %s, z: %s, zoom: %s",
color, scale, startingX, startingZ, x, z, zoom)); // color, scale, startingX, startingZ, x, z, zoom));
} }
} }
} }

View File

@ -258,7 +258,7 @@ public abstract class EventCreature<T extends LivingEntity> implements Listener
@EventHandler @EventHandler
public void onChunkUnload(ChunkUnloadEvent event) public void onChunkUnload(ChunkUnloadEvent event)
{ {
if (_entity.getLocation().getChunk().equals(event.getChunk())) if (_entity != null && _entity.getLocation().getChunk().equals(event.getChunk()))
event.setCancelled(true); event.setCancelled(true);
} }