diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-26 22:41:06 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-04 09:48:58 +0000 |
| commit | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch) | |
| tree | 554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/SecondaryWorldServer.patch | |
| parent | 33d5de312e9fcc8aec3fc53136658cb6920562aa (diff) | |
| download | craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip | |
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/SecondaryWorldServer.patch')
| -rw-r--r-- | nms-patches/SecondaryWorldServer.patch | 21 |
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 } } |