diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch index 1903a6983..f05c96eb7 100644 --- a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch +++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch @@ -1,14 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/chunk/Chunk.java +++ ../src-work/minecraft/net/minecraft/world/chunk/Chunk.java -@@ -10,7 +10,6 @@ - import java.util.concurrent.Callable; - import java.util.concurrent.ConcurrentLinkedQueue; - import net.minecraft.block.Block; --import net.minecraft.block.ITileEntityProvider; - import net.minecraft.block.material.Material; - import net.minecraft.block.state.IBlockState; - import net.minecraft.crash.CrashReport; -@@ -167,7 +166,7 @@ +@@ -167,7 +167,7 @@ { Block block = this.func_150810_a(j, l - 1, k); @@ -17,7 +9,7 @@ { this.field_76634_f[k << 4 | j] = l; -@@ -440,12 +439,12 @@ +@@ -440,12 +440,12 @@ public int func_177437_b(BlockPos p_177437_1_) { @@ -32,7 +24,7 @@ } private Block func_150810_a(int p_150810_1_, int p_150810_2_, int p_150810_3_) -@@ -623,14 +622,19 @@ +@@ -623,14 +623,19 @@ extendedblockstorage.func_177484_a(i, j & 15, k, p_177436_2_); @@ -54,7 +46,7 @@ this.field_76637_e.func_175713_t(p_177436_1_); } } -@@ -647,8 +651,8 @@ +@@ -647,8 +652,8 @@ } else { @@ -65,7 +57,7 @@ if (j1 > 0) { -@@ -668,28 +672,18 @@ +@@ -668,28 +673,18 @@ } } @@ -96,7 +88,7 @@ this.field_76637_e.func_175690_a(p_177436_1_, tileentity1); } -@@ -792,6 +786,7 @@ +@@ -792,6 +787,7 @@ k = this.field_76645_j.length - 1; } @@ -104,7 +96,7 @@ p_76612_1_.field_70175_ag = true; p_76612_1_.field_70176_ah = this.field_76635_g; p_76612_1_.field_70162_ai = k; -@@ -830,13 +825,20 @@ +@@ -830,13 +826,20 @@ private TileEntity func_177422_i(BlockPos p_177422_1_) { Block block = this.func_177428_a(p_177422_1_); @@ -126,7 +118,7 @@ if (tileentity == null) { if (p_177424_2_ == Chunk.EnumCreateEntityType.IMMEDIATE) -@@ -849,11 +851,6 @@ +@@ -849,11 +852,6 @@ this.field_177447_w.add(p_177424_1_); } } @@ -138,7 +130,7 @@ return tileentity; } -@@ -873,7 +870,7 @@ +@@ -873,7 +871,7 @@ p_177426_2_.func_145834_a(this.field_76637_e); p_177426_2_.func_174878_a(p_177426_1_); @@ -147,7 +139,7 @@ { if (this.field_150816_i.containsKey(p_177426_1_)) { -@@ -882,6 +879,7 @@ +@@ -882,6 +880,7 @@ p_177426_2_.func_145829_t(); this.field_150816_i.put(p_177426_1_, p_177426_2_); @@ -155,7 +147,7 @@ } } -@@ -910,8 +908,9 @@ +@@ -910,8 +909,9 @@ entity.func_110123_P(); } @@ -166,7 +158,7 @@ } public void func_76623_d() -@@ -927,6 +926,7 @@ +@@ -927,6 +927,7 @@ { this.field_76637_e.func_175681_c(this.field_76645_j[i]); } @@ -174,7 +166,7 @@ } public void func_76630_e() -@@ -936,8 +936,8 @@ +@@ -936,8 +937,8 @@ public void func_177414_a(Entity p_177414_1_, AxisAlignedBB p_177414_2_, List p_177414_3_, Predicate p_177414_4_) { @@ -185,7 +177,7 @@ i = MathHelper.func_76125_a(i, 0, this.field_76645_j.length - 1); j = MathHelper.func_76125_a(j, 0, this.field_76645_j.length - 1); -@@ -976,8 +976,8 @@ +@@ -976,8 +977,8 @@ public void func_177430_a(Class p_177430_1_, AxisAlignedBB p_177430_2_, List p_177430_3_, Predicate p_177430_4_) { @@ -196,7 +188,7 @@ i = MathHelper.func_76125_a(i, 0, this.field_76645_j.length - 1); j = MathHelper.func_76125_a(j, 0, this.field_76645_j.length - 1); -@@ -1137,8 +1137,10 @@ +@@ -1137,8 +1138,10 @@ while (!this.field_177447_w.isEmpty()) { BlockPos blockpos = (BlockPos)this.field_177447_w.poll(); @@ -208,7 +200,7 @@ { TileEntity tileentity = this.func_177422_i(blockpos); this.field_76637_e.func_175690_a(blockpos, tileentity); -@@ -1200,6 +1202,13 @@ +@@ -1200,6 +1203,13 @@ @SideOnly(Side.CLIENT) public void func_177439_a(byte[] p_177439_1_, int p_177439_2_, boolean p_177439_3_) { @@ -222,7 +214,7 @@ int i = 0; boolean flag = !this.field_76637_e.field_73011_w.func_177495_o(); -@@ -1267,10 +1276,16 @@ +@@ -1267,10 +1277,16 @@ this.field_76646_k = true; this.func_76590_a(); @@ -239,7 +231,7 @@ } public BiomeGenBase func_177411_a(BlockPos p_177411_1_, WorldChunkManager p_177411_2_) -@@ -1583,4 +1598,20 @@ +@@ -1583,4 +1599,20 @@ QUEUED, CHECK; }