Update CraftBukkit to Minecraft 1.3.1

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/java/net/minecraft/server/SecondaryWorldServer.java b/src/main/java/net/minecraft/server/SecondaryWorldServer.java
index 0f1bcadc..24e620a4 100644
--- a/src/main/java/net/minecraft/server/SecondaryWorldServer.java
+++ b/src/main/java/net/minecraft/server/SecondaryWorldServer.java
@@ -1,10 +1,13 @@
 package net.minecraft.server;
 
 public class SecondaryWorldServer extends WorldServer {
-    // CraftBukkit start
-    public SecondaryWorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, String s, int i, WorldSettings worldsettings, WorldServer worldserver, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
-        super(minecraftserver, idatamanager, s, i, worldsettings, env, gen);
+    // CraftBukkit start - Changed signature
+    public SecondaryWorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, String s, int i, WorldSettings worldsettings, WorldServer worldserver, MethodProfiler methodprofiler, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
+        super(minecraftserver, idatamanager, s, i, worldsettings, methodprofiler, env, gen);
         // CraftBukkit end
         this.worldMaps = worldserver.worldMaps;
+        this.worldData = new SecondaryWorldData(worldserver.getWorldData());
     }
+
+    protected void a() {}
 }