Paper/nms-patches/SecondaryWorldServer.patch

39 lines
1.6 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/SecondaryWorldServer.java
+++ b/net/minecraft/server/SecondaryWorldServer.java
2018-07-15 02:00:00 +02:00
@@ -6,9 +6,12 @@
2016-06-09 03:43:49 +02:00
private final 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;
2015-02-26 23:41:06 +01:00
+ /* CraftBukkit start
worldserver.getWorldBorder().a(new IWorldBorderListener() {
public void a(WorldBorder worldborder, double d0) {
SecondaryWorldServer.this.getWorldBorder().setSize(d0);
2018-07-15 02:00:00 +02:00
@@ -38,9 +41,10 @@
2015-02-26 23:41:06 +01:00
SecondaryWorldServer.this.getWorldBorder().setDamageBuffer(d0);
}
});
+ // CraftBukkit end */
}
- protected void a() {}
+ // protected void a() {} // CraftBukkit
2018-07-15 02:00:00 +02:00
public GeneratorAccess b() {
this.worldMaps = this.a.s_();
@@ -55,7 +59,7 @@
this.villages.a((World) this);
}
- return this;
2015-02-26 23:41:06 +01:00
+ return super.b(); // CraftBukkit
}
2016-02-29 22:32:46 +01:00
2018-07-15 02:00:00 +02:00
public void t_() {