Fix a few minor bugs
Fix villager hunger bug
Make combat resume