Made sure entities do not go back to their original position unless they finished fighting (also removed entity side check for security bots).