Fix #1361,#1459 (Makes constructs immune to ZAS stun)

(cherry picked from commit 2f46950364d386a8115844c8c77f8e8b506c8751)