mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 19:15:32 +01:00
36 lines
1.8 KiB
Diff
36 lines
1.8 KiB
Diff
--- ../work/decompile-8eb82bde/net/minecraft/server/SecondaryWorldServer.java 2014-12-10 19:16:20.748465386 +0000
|
|
+++ src/main/java/net/minecraft/server/SecondaryWorldServer.java 2014-12-10 18:55:01.104479276 +0000
|
|
@@ -4,17 +4,19 @@
|
|
|
|
private WorldServer a;
|
|
|
|
- public SecondaryWorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, int i, WorldServer worldserver, MethodProfiler methodprofiler) {
|
|
- super(minecraftserver, idatamanager, new SecondaryWorldData(worldserver.getWorldData()), i, methodprofiler);
|
|
+ // CraftBukkit start - Add WorldData, Environment and ChunkGenerator arguments
|
|
+ public SecondaryWorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, int i, WorldServer worldserver, MethodProfiler methodprofiler, WorldData worldData, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
|
|
+ super(minecraftserver, idatamanager, worldData, i, methodprofiler, env, gen);
|
|
+ // CraftBukkit end
|
|
this.a = worldserver;
|
|
- worldserver.af().a((IWorldBorderListener) (new SecondaryWorldServerInnerClass1(this)));
|
|
+ // worldserver.af().a((IWorldBorderListener) (new SecondaryWorldServerInnerClass1(this)));
|
|
}
|
|
|
|
- protected void a() {}
|
|
+ // protected void a() {} // CraftBukkit
|
|
|
|
public World b() {
|
|
this.worldMaps = this.a.T();
|
|
- this.scoreboard = this.a.getScoreboard();
|
|
+ // this.scoreboard = this.a.getScoreboard(); // CraftBukkit
|
|
String s = PersistentVillage.a(this.worldProvider);
|
|
PersistentVillage persistentvillage = (PersistentVillage) this.worldMaps.get(PersistentVillage.class, s);
|
|
|
|
@@ -26,6 +28,6 @@
|
|
this.villages.a((World) this);
|
|
}
|
|
|
|
- return this;
|
|
+ return super.b();
|
|
}
|
|
}
|