Fix weapon incorrectly showing when saving and loading with spell equipped
Fix WeaponAnimationTime not working when loading save/re-entering cell (Fixes #1497)