summaryrefslogtreecommitdiffstats
path: root/nms-patches/ItemWrittenBook.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-15 10:00:00 +1000
committermd_5 <git@md-5.net>2018-07-15 10:00:00 +1000
commit421c1728c81e2f729dff88da2ac96535d2b8e5e8 (patch)
tree6c51d93e811d1eb86b68461a42fc5cf03b168b0c /nms-patches/ItemWrittenBook.patch
parent57ab4cfc6f4ff526d44319d9b8c79f6848db2de7 (diff)
downloadcraftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.gz
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.lz
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.xz
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.zip
Update to Minecraft 1.13-pre7
Diffstat (limited to 'nms-patches/ItemWrittenBook.patch')
-rw-r--r--nms-patches/ItemWrittenBook.patch54
1 files changed, 27 insertions, 27 deletions
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))));
+ }