Fixed NPE onEntityDeath