From 17a714f7fd667a6ce3fba524c7ef71016aa3daa8 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 19 Jun 2017 22:40:57 -0700 Subject: [PATCH] Fix patches in Chunk and Explosion (#4036) --- patches/minecraft/net/minecraft/world/Explosion.java.patch | 2 +- patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/world/Explosion.java.patch b/patches/minecraft/net/minecraft/world/Explosion.java.patch index 90b0c87f2..82f20efd5 100644 --- a/patches/minecraft/net/minecraft/world/Explosion.java.patch +++ b/patches/minecraft/net/minecraft/world/Explosion.java.patch @@ -12,7 +12,7 @@ this.field_77282_d = p_i45754_7_; this.field_77286_a = p_i45754_10_; this.field_82755_b = p_i45754_11_; -+ this.position = new Vec3d(field_77284_b, field_77285_c, field_77282_d); ++ this.position = new Vec3d(this.field_77284_b, this.field_77285_c, this.field_77282_d); } public void func_77278_a() diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch index 23b998d58..27ac704b9 100644 --- a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch +++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch @@ -21,7 +21,7 @@ { - return this.func_186032_a(p_150808_1_, p_150808_2_, p_150808_3_).func_185891_c(); + IBlockState state = this.func_186032_a(p_150808_1_, p_150808_2_, p_150808_3_); //Forge: Can sometimes be called before we are added to the global world list. So use the less accurate one during that. It'll be recalculated later -+ return !field_76636_d ? state.func_185891_c() : state.getLightOpacity(field_76637_e, new BlockPos(field_76635_g << 4 | p_150808_1_ & 15, p_150808_2_, field_76647_h << 4 | p_150808_3_ & 15)); ++ return !field_76636_d ? state.func_185891_c() : state.getLightOpacity(field_76637_e, new BlockPos(this.field_76635_g << 4 | this.field_76635_g & 15, p_150808_2_, this.field_76647_h << 4 | this.field_76647_h & 15)); } public IBlockState func_177435_g(BlockPos p_177435_1_)