avoid world change bork in shoot commandalso opti some logic when script arg not used (commit: ba84944)