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

Update to Minecraft 1.8.3

Browse Source
This commit is contained in:
Thinkofdeath
2015-02-26 22:41:06 +00:00
parent 33d5de312e
commit d8a9c7be42
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
nms-patches/RegionFile.patch
View File

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