12.2 Fixed undying/persist, ETB triggers

some pesky stackResolve lines were still in there