mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-08 08:02:13 -07:00
Update to Minecraft 1.13-pre7
This commit is contained in:
@@ -1,31 +1,15 @@
|
||||
--- a/net/minecraft/server/ChunkSection.java
|
||||
+++ b/net/minecraft/server/ChunkSection.java
|
||||
@@ -19,6 +19,24 @@
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
}
|
||||
|
||||
+ // CraftBukkit start
|
||||
+ public ChunkSection(int y, boolean flag, char[] blockIds) {
|
||||
+ this.yPos = y;
|
||||
+ this.blockIds = new DataPaletteBlock();
|
||||
+ for (int i = 0; i < blockIds.length; i++) {
|
||||
+ int xx = i & 15;
|
||||
+ int yy = (i >> 8) & 15;
|
||||
+ int zz = (i >> 4) & 15;
|
||||
+ this.blockIds.setBlock(xx, yy, zz, Block.REGISTRY_ID.fromId(blockIds[i]));
|
||||
+ }
|
||||
+ this.emittedLight = new NibbleArray();
|
||||
+ if (flag) {
|
||||
+ this.skyLight = new NibbleArray();
|
||||
+ }
|
||||
+ recalcBlockCounts();
|
||||
+ }
|
||||
+ // CraftBukkit end
|
||||
+
|
||||
public IBlockData getType(int i, int j, int k) {
|
||||
return this.blockIds.a(i, j, k);
|
||||
}
|
||||
@@ -46,7 +64,7 @@
|
||||
public ChunkSection(int i, boolean flag) {
|
||||
this.yPos = i;
|
||||
- this.blockIds = new DataPaletteBlock(ChunkSection.GLOBAL_PALETTE, Block.REGISTRY_ID, GameProfileSerializer::d, GameProfileSerializer::a, Blocks.AIR.getBlockData());
|
||||
+ this.blockIds = new DataPaletteBlock<>(ChunkSection.GLOBAL_PALETTE, Block.REGISTRY_ID, GameProfileSerializer::d, GameProfileSerializer::a, Blocks.AIR.getBlockData()); // CraftBukkit - decompile error
|
||||
this.emittedLight = new NibbleArray();
|
||||
if (flag) {
|
||||
this.skyLight = new NibbleArray();
|
||||
@@ -62,7 +62,7 @@
|
||||
}
|
||||
|
||||
public boolean a() {
|
||||
@@ -33,4 +17,4 @@
|
||||
+ return false; // CraftBukkit - MC-80966
|
||||
}
|
||||
|
||||
public boolean shouldTick() {
|
||||
public boolean b() {
|
||||
|
Reference in New Issue
Block a user