summaryrefslogtreecommitdiffstats
path: root/nms-patches/SecondaryWorldServer.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/SecondaryWorldServer.patch')
-rw-r--r--nms-patches/SecondaryWorldServer.patch21
1 files changed, 14 insertions, 7 deletions
diff --git a/nms-patches/SecondaryWorldServer.patch b/nms-patches/SecondaryWorldServer.patch
index 8356c3ad..c0d3fc76 100644
--- a/nms-patches/SecondaryWorldServer.patch
+++ b/nms-patches/SecondaryWorldServer.patch
@@ -1,6 +1,6 @@
---- ../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 @@
+--- /home/matt/mc-dev-private//net/minecraft/server/SecondaryWorldServer.java 2015-02-26 22:40:23.075608134 +0000
++++ src/main/java/net/minecraft/server/SecondaryWorldServer.java 2015-02-26 22:40:23.075608134 +0000
+@@ -4,9 +4,12 @@
private WorldServer a;
@@ -11,8 +11,15 @@
+ 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)));
++ /* CraftBukkit start
+ worldserver.getWorldBorder().a(new IWorldBorderListener() {
+ public void a(WorldBorder worldborder, double d0) {
+ SecondaryWorldServer.this.getWorldBorder().setSize(d0);
+@@ -36,13 +39,14 @@
+ SecondaryWorldServer.this.getWorldBorder().setDamageBuffer(d0);
+ }
+ });
++ // CraftBukkit end */
}
- protected void a() {}
@@ -25,11 +32,11 @@
String s = PersistentVillage.a(this.worldProvider);
PersistentVillage persistentvillage = (PersistentVillage) this.worldMaps.get(PersistentVillage.class, s);
-@@ -26,6 +28,6 @@
+@@ -54,6 +58,6 @@
this.villages.a((World) this);
}
- return this;
-+ return super.b();
++ return super.b(); // CraftBukkit
}
}