theoretical refactor, not tested in the slightest

Written in notepad++ with no knowledge of bukkit and it's been a while since i used Java. So don't take it for working, *at all*.