twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-06 07:02:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.11

Browse Source
This commit is contained in:
md_5
2016-11-17 12:41:03 +11:00
parent 51263e9718
commit c25ddf063a
279 changed files with 3722 additions and 2992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nms-patches/RegionFileCache.patch
View File

@@ -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);