Paper/nms-patches/SecondaryWorldServer.patch
2018-12-26 08:00:00 +11:00

38 lines
1.8 KiB
Diff

--- a/net/minecraft/server/SecondaryWorldServer.java
+++ b/net/minecraft/server/SecondaryWorldServer.java
@@ -2,8 +2,11 @@
public class SecondaryWorldServer extends WorldServer {
- public SecondaryWorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, DimensionManager dimensionmanager, WorldServer worldserver, MethodProfiler methodprofiler) {
- super(minecraftserver, idatamanager, worldserver.h(), new SecondaryWorldData(worldserver.getWorldData()), dimensionmanager, methodprofiler);
+ // CraftBukkit start - Add WorldData, Environment and ChunkGenerator arguments
+ public SecondaryWorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, DimensionManager dimensionmanager, WorldServer worldserver, MethodProfiler methodprofiler, WorldData worldData, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
+ super(minecraftserver, idatamanager, worldserver.h(), worldData, dimensionmanager, methodprofiler, env, gen);
+ // CraftBukkit end
+ /* CraftBukkit start
worldserver.getWorldBorder().a(new IWorldBorderListener() {
public void a(WorldBorder worldborder, double d0) {
SecondaryWorldServer.this.getWorldBorder().setSize(d0);
@@ -33,9 +36,10 @@
SecondaryWorldServer.this.getWorldBorder().setDamageBuffer(d0);
}
});
+ // CraftBukkit end */
}
- protected void a() {}
+ // protected void a() {} // CraftBukkit
public SecondaryWorldServer i_() {
String s = PersistentVillage.a(this.worldProvider);
@@ -49,7 +53,7 @@
this.villages.a((World) this);
}
- return this;
+ return (SecondaryWorldServer) super.i_(); // CraftBukkit
}
public void t_() {