21 lines
1.6 KiB
Diff
21 lines
1.6 KiB
Diff
--- a/net/minecraft/block/CampfireBlock.java
|
|
+++ b/net/minecraft/block/CampfireBlock.java
|
|
@@ -181,7 +181,7 @@
|
|
public void func_220066_a(World p_220066_1_, BlockState p_220066_2_, BlockRayTraceResult p_220066_3_, ProjectileEntity p_220066_4_) {
|
|
if (!p_220066_1_.field_72995_K && p_220066_4_.func_70027_ad()) {
|
|
Entity entity = p_220066_4_.func_234616_v_();
|
|
- boolean flag = entity == null || entity instanceof PlayerEntity || p_220066_1_.func_82736_K().func_223586_b(GameRules.field_223599_b);
|
|
+ boolean flag = entity == null || entity instanceof PlayerEntity || net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(p_220066_1_, entity);
|
|
if (flag && !p_220066_2_.func_177229_b(field_220101_b) && !p_220066_2_.func_177229_b(field_220103_d)) {
|
|
BlockPos blockpos = p_220066_3_.func_216350_a();
|
|
p_220066_1_.func_180501_a(blockpos, p_220066_2_.func_206870_a(BlockStateProperties.field_208190_q, Boolean.valueOf(true)), 11);
|
|
@@ -208,7 +208,7 @@
|
|
return true;
|
|
}
|
|
|
|
- boolean flag = VoxelShapes.func_197879_c(field_226912_f_, blockstate.func_215685_b(p_235474_0_, p_235474_1_, ISelectionContext.func_216377_a()), IBooleanFunction.field_223238_i_);
|
|
+ boolean flag = VoxelShapes.func_197879_c(field_226912_f_, blockstate.func_215685_b(p_235474_0_, blockpos, ISelectionContext.func_216377_a()), IBooleanFunction.field_223238_i_);//Forge fix: MC-201374
|
|
if (flag) {
|
|
BlockState blockstate1 = p_235474_0_.func_180495_p(blockpos.func_177977_b());
|
|
return func_226915_i_(blockstate1);
|