From 421c1728c81e2f729dff88da2ac96535d2b8e5e8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 15 Jul 2018 10:00:00 +1000
Subject: Update to Minecraft 1.13-pre7

---
 nms-patches/ItemWrittenBook.patch | 54 +++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

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

diff --git a/nms-patches/ItemWrittenBook.patch b/nms-patches/ItemWrittenBook.patch
index 3a4e4761..e43dd909 100644
--- a/nms-patches/ItemWrittenBook.patch
+++ b/nms-patches/ItemWrittenBook.patch
@@ -1,34 +1,34 @@
 --- a/net/minecraft/server/ItemWrittenBook.java
 +++ b/net/minecraft/server/ItemWrittenBook.java
-@@ -61,6 +61,23 @@
+@@ -62,6 +62,23 @@
  
-                         Object object;
+                     Object object;
  
-+                        // CraftBukkit start
-+                        // Some commands use the worldserver variable but we leave it full of null values,
-+                        // so we must temporarily populate it with the world of the commandsender
-+                        WorldServer[] prev = MinecraftServer.getServer().worldServer;
-+                        MinecraftServer server = MinecraftServer.getServer();
-+                        server.worldServer = new WorldServer[server.worlds.size()];
-+                        server.worldServer[0] = (WorldServer) entityhuman.getWorld();
-+                        int bpos = 0;
-+                        for (int pos = 1; pos < server.worldServer.length; pos++) {
-+                            WorldServer world = server.worlds.get(bpos++);
-+                            if (server.worldServer[0] == world) {
-+                                pos--;
-+                                continue;
-+                            }
-+                            server.worldServer[pos] = world;
++                    // CraftBukkit start
++                    // Some commands use the worldserver variable but we leave it full of null values,
++                    // so we must temporarily populate it with the world of the commandsender
++                    WorldServer[] prev = MinecraftServer.getServer().worldServer;
++                    MinecraftServer server = MinecraftServer.getServer();
++                    server.worldServer = new WorldServer[server.worlds.size()];
++                    server.worldServer[0] = (WorldServer) entityhuman.getWorld();
++                    int bpos = 0;
++                    for (int pos = 1; pos < server.worldServer.length; pos++) {
++                        WorldServer world = server.worlds.get(bpos++);
++                        if (server.worldServer[0] == world) {
++                            pos--;
++                            continue;
 +                        }
-+                        // CraftBukkit end
-                         try {
-                             IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.b(s);
++                        server.worldServer[pos] = world;
++                    }
++                    // CraftBukkit end
+                     try {
+                         IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.b(s);
  
-@@ -68,6 +85,7 @@
-                         } catch (Exception exception) {
-                             object = new ChatComponentText(s);
-                         }
-+                        finally { MinecraftServer.getServer().worldServer = prev; } // CraftBukkit
- 
-                         nbttaglist.a(i, new NBTTagString(IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) object)));
+@@ -69,6 +86,7 @@
+                     } catch (Exception exception) {
+                         object = new ChatComponentText(s);
                      }
++                    finally { MinecraftServer.getServer().worldServer = prev; } // CraftBukkit
+ 
+                     nbttaglist.set(i, (NBTBase) (new NBTTagString(IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) object))));
+                 }
-- 
cgit v1.2.3