[Fix] Armed traps in combat change