Update to Minecraft 1.15.1

This commit is contained in:
md_5
2019-12-18 08:00:00 +11:00
parent e2790ae2ea
commit 30a1b6911f
9 changed files with 40 additions and 52 deletions

View File

@@ -1,15 +1,15 @@
--- a/net/minecraft/server/BiomeStorage.java
+++ b/net/minecraft/server/BiomeStorage.java
@@ -77,7 +77,7 @@
int[] aint = new int[this.f.length];
@@ -88,7 +88,7 @@
int[] aint = new int[this.g.length];
for (int i = 0; i < this.f.length; ++i) {
- aint[i] = IRegistry.BIOME.a((Object) this.f[i]);
+ aint[i] = IRegistry.BIOME.a(this.f[i]); // CraftBukkit - decompile error
for (int i = 0; i < this.g.length; ++i) {
- aint[i] = IRegistry.BIOME.a((Object) this.g[i]);
+ aint[i] = IRegistry.BIOME.a(this.g[i]); // CraftBukkit - decompile error
}
return aint;
@@ -90,7 +90,7 @@
@@ -101,7 +101,7 @@
for (int j = 0; j < i; ++j) {
BiomeBase biomebase = abiomebase[j];
@@ -18,9 +18,9 @@
}
}
@@ -107,4 +107,14 @@
@@ -118,4 +118,14 @@
return this.f[i1 << BiomeStorage.d + BiomeStorage.d | j1 << BiomeStorage.d | l];
return this.g[i1 << BiomeStorage.e + BiomeStorage.e | j1 << BiomeStorage.e | l];
}
+
+ // CraftBukkit start
@@ -29,7 +29,7 @@
+ int i1 = MathHelper.clamp(j, 0, BiomeStorage.c);
+ int j1 = k & BiomeStorage.b;
+
+ this.f[i1 << BiomeStorage.d + BiomeStorage.d | j1 << BiomeStorage.d | l] = biome;
+ this.g[i1 << BiomeStorage.e + BiomeStorage.e | j1 << BiomeStorage.e | l] = biome;
+ }
+ // CraftBukkit end
}