From aa008dff0f9bedbe88e1fe79831776b0a52eb90a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 1 Mar 2016 08:32:46 +1100
Subject: Update to Minecraft 1.9

---
 nms-patches/SecondaryWorldServer.patch | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'nms-patches/SecondaryWorldServer.patch')

diff --git a/nms-patches/SecondaryWorldServer.patch b/nms-patches/SecondaryWorldServer.patch
index a26d9cd0..cde0aaa9 100644
--- a/nms-patches/SecondaryWorldServer.patch
+++ b/nms-patches/SecondaryWorldServer.patch
@@ -15,7 +15,7 @@
          worldserver.getWorldBorder().a(new IWorldBorderListener() {
              public void a(WorldBorder worldborder, double d0) {
                  SecondaryWorldServer.this.getWorldBorder().setSize(d0);
-@@ -36,13 +39,14 @@
+@@ -36,9 +39,10 @@
                  SecondaryWorldServer.this.getWorldBorder().setDamageBuffer(d0);
              }
          });
@@ -26,17 +26,13 @@
 +    // protected void a() {} // CraftBukkit
  
      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);
- 
-@@ -54,6 +58,6 @@
+         this.worldMaps = this.a.X();
+@@ -55,7 +59,7 @@
              this.villages.a((World) this);
          }
  
 -        return this;
 +        return super.b(); // CraftBukkit
      }
- }
+ 
+     public void c() {
-- 
cgit v1.2.3