1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
--- ../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();
}
+ }
+
+ // 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)) {
+ return false;
+ } else {
+ try {
+ int k = this.e(i, j);
+
+ if (k == 0) {
+ return false;
+ } else {
+ int l = k >> 8;
+ int i1 = k & 255;
+
+ if (l + i1 > this.f.size()) {
+ return false;
+ }
+
+ this.c.seek((long) (l * 4096));
+ int j1 = this.c.readInt();
+
+ if (j1 > 4096 * i1 || j1 <= 0) {
+ return false;
+ }
+
+ byte b0 = this.c.readByte();
+ if (b0 == 1 || b0 == 2) {
+ return true;
+ }
+ }
+ } catch (IOException ioexception) {
+ 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();
}
|
