diff options
Diffstat (limited to 'nms-patches/SecondaryWorldServer.patch')
| -rw-r--r-- | nms-patches/SecondaryWorldServer.patch | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/nms-patches/SecondaryWorldServer.patch b/nms-patches/SecondaryWorldServer.patch index 9cd69d5a..8356c3ad 100644 --- a/nms-patches/SecondaryWorldServer.patch +++ b/nms-patches/SecondaryWorldServer.patch @@ -1,6 +1,6 @@ ---- /home/antony/work/spigot-BuildTools/work/decompile-8eb82bde//net/minecraft/server/SecondaryWorldServer.java 2014-12-03 12:27:34.906671655 +0200 -+++ src/main/java/net/minecraft/server/SecondaryWorldServer.java 2014-12-10 18:20:15.598416391 +0200 -@@ -4,13 +4,15 @@ +--- ../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; @@ -11,7 +11,8 @@ + 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))); ++ // worldserver.af().a((IWorldBorderListener) (new SecondaryWorldServerInnerClass1(this))); } - protected void a() {} @@ -19,3 +20,16 @@ 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(); + } + } |