Apply trap magic effects
Fix spell icons displayed when effect ended
Merge remote-tracking branch 'potatoesmaster/magic'