Fix posibly forged layer and different layer during equip trigger (#1391)#1421

cbnolok merged 2 commits intoSphereserver:devSphereserver/Source-X:devfrom

mtwango:layer-equiptest-fixmtwango/Source-X:layer-equiptest-fixCopy head branch name to clipboard