Fix CommandExecuter error, change some things in Entity events