From d8a9c7be4227b2243968b63ab7cc7a00098c93ad Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Feb 2015 22:41:06 +0000 Subject: Update to Minecraft 1.8.3 --- nms-patches/RegionFile.patch | 53 +++++++++----------------------------------- 1 file changed, 10 insertions(+), 43 deletions(-) (limited to 'nms-patches/RegionFile.patch') diff --git a/nms-patches/RegionFile.patch b/nms-patches/RegionFile.patch index 68fbd0cb..19df82ef 100644 --- a/nms-patches/RegionFile.patch +++ b/nms-patches/RegionFile.patch @@ -1,11 +1,9 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/RegionFile.java 2014-11-28 17:43:43.361707429 +0000 -+++ src/main/java/net/minecraft/server/RegionFile.java 2014-11-28 17:38:17.000000000 +0000 -@@ -86,8 +86,46 @@ - } catch (IOException ioexception) { - ioexception.printStackTrace(); - } -+ } -+ +--- /home/matt/mc-dev-private//net/minecraft/server/RegionFile.java 2015-02-26 22:40:23.063608134 +0000 ++++ src/main/java/net/minecraft/server/RegionFile.java 2015-02-26 22:40:23.063608134 +0000 +@@ -90,6 +90,45 @@ + + } + + // CraftBukkit start - This is a copy (sort of) of the method below it, make sure they stay in sync + public synchronized boolean chunkExists(int i, int j) { + if (this.d(i, j)) { @@ -40,42 +38,11 @@ + return false; + } + } - ++ + return false; - } ++ } + // CraftBukkit end - ++ public synchronized DataInputStream a(int i, int j) { if (this.d(i, j)) { -@@ -214,7 +252,7 @@ - - } - -- private void a(int i, byte[] abyte, int j) { -+ private void a(int i, byte[] abyte, int j) throws IOException { // CraftBukkit - added throws - this.c.seek((long) (i * 4096)); - this.c.writeInt(j + 1); - this.c.writeByte(2); -@@ -233,19 +271,19 @@ - return this.e(i, j) != 0; - } - -- private void a(int i, int j, int k) { -+ private void a(int i, int j, int k) throws IOException { // CraftBukkit - added throws - this.d[i + j * 32] = k; - this.c.seek((long) ((i + j * 32) * 4)); - this.c.writeInt(k); - } - -- private void b(int i, int j, int k) { -+ private void b(int i, int j, int k) throws IOException { // CraftBukkit - added throws - this.e[i + j * 32] = k; - this.c.seek((long) (4096 + (i + j * 32) * 4)); - this.c.writeInt(k); - } - -- public void c() { -+ public void c() throws IOException { // CraftBukkit - added throws - if (this.c != null) { - this.c.close(); - } + return null; -- cgit v1.2.3