You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
2.0 KiB
38 lines
2.0 KiB
--- ../src-base/minecraft/net/minecraft/world/WorldServerMulti.java |
|
+++ ../src-work/minecraft/net/minecraft/world/WorldServerMulti.java |
|
@@ -9,16 +9,35 @@ |
|
{ |
|
private static final String __OBFID = "CL_00001430"; |
|
|
|
+ // CraftBukkit start - Add Environment and ChunkGenerator arguments |
|
+ public WorldServerMulti(MinecraftServer p_i45283_1_, ISaveHandler p_i45283_2_, String p_i45283_3_, int p_i45283_4_, WorldSettings p_i45283_5_, WorldServer p_i45283_6_, Profiler p_i45283_7_, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) |
|
+ { |
|
+ super(p_i45283_1_, p_i45283_2_, p_i45283_3_, p_i45283_4_, p_i45283_5_, p_i45283_7_, env, gen); |
|
+ // CraftBukkit end |
|
+ this.mapStorage = p_i45283_6_.mapStorage; |
|
+ this.worldScoreboard = p_i45283_6_.getScoreboard(); |
|
+ //this.worldInfo = new DerivedWorldInfo(p_i45283_6_.getWorldInfo()); |
|
+ //this.worldInfo.setWorldName(p_i45283_3_); |
|
+ } |
|
+ |
|
+ // Cauldron start - vanilla compatibility |
|
public WorldServerMulti(MinecraftServer p_i45283_1_, ISaveHandler p_i45283_2_, String p_i45283_3_, int p_i45283_4_, WorldSettings p_i45283_5_, WorldServer p_i45283_6_, Profiler p_i45283_7_) |
|
{ |
|
super(p_i45283_1_, p_i45283_2_, p_i45283_3_, p_i45283_4_, p_i45283_5_, p_i45283_7_); |
|
this.mapStorage = p_i45283_6_.mapStorage; |
|
this.worldScoreboard = p_i45283_6_.getScoreboard(); |
|
this.worldInfo = new DerivedWorldInfo(p_i45283_6_.getWorldInfo()); |
|
+ //this.worldInfo.setWorldName(p_i45283_3_); |
|
} |
|
+ // Cauldron end |
|
|
|
+ /* we handle all saving including perWorldStorage in WorldServer.saveLevel. This needs to be disabled since we follow |
|
+ // bukkit's world saving methods by using a seperate save handler for each world. Each world folder needs to generate a corresponding |
|
+ // level.dat for plugins that require it such as MultiWorld. |
|
protected void saveLevel() throws MinecraftException |
|
{ |
|
this.perWorldStorage.saveAllData(); |
|
} |
|
+ */ |
|
+ // Cauldron end |
|
}
|
|
|