/
RegionFile.java.patch
92 lines (85 loc) · 4.23 KB
/
RegionFile.java.patch
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
82
83
84
85
86
87
88
89
90
91
92
--- a/net/minecraft/world/chunk/storage/RegionFile.java
+++ b/net/minecraft/world/chunk/storage/RegionFile.java
@@ -18,6 +18,10 @@
import net.minecraft.util.Util;
public class RegionFile {
+ // Minecraft is limited to 256 sections per chunk. So 1MB. This can easily be override.
+ // So we extend this to use the REAL size when the count is maxed by seeking to that section and reading the length.
+ private static final boolean FORGE_ENABLE_EXTENDED_SAVE = Boolean.parseBoolean(System.getProperty("forge.enableExtendedSave", "true"));
+ private static final org.apache.logging.log4j.Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger();
private static final byte[] field_76720_a = new byte[4096];
private final File field_76718_b;
private RandomAccessFile field_76719_c;
@@ -63,11 +67,21 @@
for(int j1 = 0; j1 < 1024; ++j1) {
int k = this.field_76719_c.readInt();
this.field_76716_d[j1] = k;
- if (k != 0 && (k >> 8) + (k & 255) <= this.field_76714_f.size()) {
- for(int l = 0; l < (k & 255); ++l) {
+ int length = k & 255;
+ if (length == 255) {
+ if ((k >> 8) <= this.field_76714_f.size()) { // We're maxed out, so we need to read the proper length from the section
+ this.field_76719_c.seek((k >> 8) * 4096);
+ length = (this.field_76719_c.readInt() + 4) / 4096 + 1;
+ this.field_76719_c.seek(j1 * 4 + 4); //Go back to where we were
+ }
+ }
+ if (k != 0 && (k >> 8) + length <= this.field_76714_f.size()) {
+ for (int l = 0; l < length; ++l) {
this.field_76714_f.set((k >> 8) + l, false);
}
}
+ else if (length > 0)
+ LOGGER.warn("Invalid chunk: ({}, {}) Offset: {} Length: {} runs off end file. {}", j1 % 32, (int)(j1 / 32), k >> 8, length, p_i2001_1_);
}
for(int k1 = 0; k1 < 1024; ++k1) {
@@ -92,14 +106,20 @@
} else {
int j = i >> 8;
int k = i & 255;
+ if (k == 255) {
+ this.field_76719_c.seek(j * 4096);
+ k = (this.field_76719_c.readInt() + 4) / 4096 + 1;
+ }
if (j + k > this.field_76714_f.size()) {
return null;
} else {
this.field_76719_c.seek((long)(j * 4096));
int l = this.field_76719_c.readInt();
if (l > 4096 * k) {
+ LOGGER.warn("Invalid chunk: ({}, {}) Offset: {} Invalid Size: {}>{} {}", p_76704_1_, p_76704_2_, j, l, k * 4096, field_76718_b);
return null;
} else if (l <= 0) {
+ LOGGER.warn("Invalid chunk: ({}, {}) Offset: {} Invalid Size: {} {}", p_76704_1_, p_76704_2_, j, l, field_76718_b);
return null;
} else {
byte b0 = this.field_76719_c.readByte();
@@ -162,9 +182,14 @@
int i = this.func_76707_e(p_76706_1_, p_76706_2_);
int j = i >> 8;
int k = i & 255;
+ if (k == 255) {
+ this.field_76719_c.seek(j * 4096);
+ k = (this.field_76719_c.readInt() + 4) / 4096 + 1;
+ }
int l = (p_76706_4_ + 5) / 4096 + 1;
if (l >= 256) {
- return;
+ if (!FORGE_ENABLE_EXTENDED_SAVE) return;
+ LOGGER.warn("Large Chunk Detected: ({}, {}) Size: {} {}", p_76706_1_, p_76706_2_, l, field_76718_b);
}
if (j != 0 && k == l) {
@@ -197,7 +222,7 @@
if (j1 >= l) {
j = l1;
- this.func_76711_a(p_76706_1_, p_76706_2_, l1 << 8 | l);
+ this.func_76711_a(p_76706_1_, p_76706_2_, l1 << 8 | (l > 255 ? 255 : l));
for(int j2 = 0; j2 < l; ++j2) {
this.field_76714_f.set(j + j2, false);
@@ -215,7 +240,7 @@
this.field_76715_g += 4096 * l;
this.func_76712_a(j, p_76706_3_, p_76706_4_);
- this.func_76711_a(p_76706_1_, p_76706_2_, j << 8 | l);
+ this.func_76711_a(p_76706_1_, p_76706_2_, j << 8 | (l > 255 ? 255 : l));
}
}