Massive renaming update in nms. If you bypassed Bukkit, you will likely break.

Also minimized all the nms diffs and generic cleanups all around.

src/main/java/net/minecraft/server/SecondaryWorldServer.java

@@ -7,6 +7,6 @@ public class SecondaryWorldServer extends WorldServer {
     public SecondaryWorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, String s, int i, long j, WorldServer worldserver, org.bukkit.World.Environment env, ChunkGenerator gen) {
         super(minecraftserver, idatamanager, s, i, j, env, gen);
         // CraftBukkit end
-        this.z = worldserver.z;
+        this.worldMaps = worldserver.worldMaps;
     }
 }