Steps to reproduce with forge xxx.2189

1. Have an uncommon sword that would spawn as an entity when dropped.
2. Die

Must be some code that breaks since death will drop your items. NOTE: Doesn't crash if keepInventory = true. Also thanks for fixing the repair bug really quickly!