diff options
Diffstat (limited to 'nms-patches/SecondaryWorldServer.patch')
| -rw-r--r-- | nms-patches/SecondaryWorldServer.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/nms-patches/SecondaryWorldServer.patch b/nms-patches/SecondaryWorldServer.patch index f92f9531..9a941819 100644 --- a/nms-patches/SecondaryWorldServer.patch +++ b/nms-patches/SecondaryWorldServer.patch @@ -1,21 +1,20 @@ --- a/net/minecraft/server/SecondaryWorldServer.java +++ b/net/minecraft/server/SecondaryWorldServer.java -@@ -6,9 +6,12 @@ +@@ -4,8 +4,11 @@ - private final WorldServer a; + public class SecondaryWorldServer extends WorldServer { -- public SecondaryWorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, int i, WorldServer worldserver, MethodProfiler methodprofiler) { -- super(minecraftserver, idatamanager, new SecondaryWorldData(worldserver.getWorldData()), i, methodprofiler); +- 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, 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); ++ 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 - this.a = worldserver; + /* CraftBukkit start worldserver.getWorldBorder().a(new IWorldBorderListener() { public void a(WorldBorder worldborder, double d0) { SecondaryWorldServer.this.getWorldBorder().setSize(d0); -@@ -38,9 +41,10 @@ +@@ -35,9 +38,10 @@ SecondaryWorldServer.this.getWorldBorder().setDamageBuffer(d0); } }); @@ -25,14 +24,14 @@ - protected void a() {} + // protected void a() {} // CraftBukkit - public GeneratorAccess b() { - this.worldMaps = this.a.s_(); -@@ -55,7 +59,7 @@ + public SecondaryWorldServer b() { + String s = PersistentVillage.a(this.worldProvider); +@@ -51,7 +55,7 @@ this.villages.a((World) this); } - return this; -+ return super.b(); // CraftBukkit ++ return (SecondaryWorldServer) super.i_(); // CraftBukkit } public void t_() { |