Fixed javadoc, added missing @Overrides

I accidentally deleted this

I'm tired, I screwed up a few things

I'm tired, I screwed up a few things
Merge branch 'master' of https://github.com/zeuslightning125/SpongeAPI