fixed merge failures in World, WorldServer, and MinecraftServer