More work, because CraftBukkit is weird and stupid and doesn't behave