Fixed field rename errors, fixes ProjectAres/CraftBukkit#14
Merge branch 'dev' of github.com:YukonAppleGeek/CraftBukkit