From c25ddf063a808e3adb749e22017661f403c5fb7e Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Nov 2016 12:41:03 +1100 Subject: Update to Minecraft 1.11 --- nms-patches/RegionFileCache.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'nms-patches/RegionFileCache.patch') diff --git a/nms-patches/RegionFileCache.patch b/nms-patches/RegionFileCache.patch index e1839bff..e97b881c 100644 --- a/nms-patches/RegionFileCache.patch +++ b/nms-patches/RegionFileCache.patch @@ -1,12 +1,12 @@ --- a/net/minecraft/server/RegionFileCache.java +++ b/net/minecraft/server/RegionFileCache.java -@@ -53,15 +53,25 @@ +@@ -74,17 +74,27 @@ RegionFileCache.a.clear(); } -- public static DataInputStream c(File file, int i, int j) { +- public static DataInputStream d(File file, int i, int j) { + // CraftBukkit start - call sites hoisted for synchronization -+ public static synchronized NBTTagCompound c(File file, int i, int j) throws IOException { ++ public static synchronized NBTTagCompound d(File file, int i, int j) throws IOException { RegionFile regionfile = a(file, i, j); - return regionfile.a(i & 31, j & 31); @@ -19,8 +19,8 @@ + return NBTCompressedStreamTools.a(datainputstream); } -- public static DataOutputStream d(File file, int i, int j) { -+ public static synchronized void d(File file, int i, int j, NBTTagCompound nbttagcompound) throws IOException { +- public static DataOutputStream e(File file, int i, int j) { ++ public static synchronized void e(File file, int i, int j, NBTTagCompound nbttagcompound) throws IOException { RegionFile regionfile = a(file, i, j); - return regionfile.b(i & 31, j & 31); @@ -29,4 +29,6 @@ + dataoutputstream.close(); } + // CraftBukkit end - } + + public static boolean f(File file, int i, int j) { + RegionFile regionfile = b(file, i, j); -- cgit v1.2.3