diff options
| author | md_5 <git@md-5.net> | 2016-11-17 12:41:03 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-11-17 12:41:03 +1100 |
| commit | c25ddf063a808e3adb749e22017661f403c5fb7e (patch) | |
| tree | b2efcff512be12fd3e38cf8c36386148ce6ab4ae /nms-patches/RegionFileCache.patch | |
| parent | 51263e97187a84338f89698eef187284055a682a (diff) | |
| download | craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.gz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.lz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.xz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.zip | |
Update to Minecraft 1.11
Diffstat (limited to 'nms-patches/RegionFileCache.patch')
| -rw-r--r-- | nms-patches/RegionFileCache.patch | 14 |
1 files changed, 8 insertions, 6 deletions
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); |