Skip to content
This repository was archived by the owner on Nov 18, 2021. It is now read-only.

Commit 739bb7a

Browse files
committed
Fix Infernal Expansion startup (MohistMC#1570)
1 parent cddc457 commit 739bb7a

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

patches/minecraft/net/minecraft/entity/Entity.java.patch

+17-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
import net.minecraft.entity.player.PlayerEntity;
7070
import net.minecraft.entity.player.ServerPlayerEntity;
7171
import net.minecraft.fluid.Fluid;
72-
@@ -106,2709 +_,3345 @@
72+
@@ -106,2709 +_,3361 @@
7373
import net.minecraft.world.server.TicketType;
7474
import net.minecraftforge.api.distmarker.Dist;
7575
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -951,17 +951,33 @@
951951
+ this.field_70170_p.getCBServer().getPluginManager().callEvent(combustEvent);
952952
+ if (!combustEvent.isCancelled()) {
953953
+ this.setFire(combustEvent.getDuration(), false);
954+
+ // Mist start - Fix Infernal Expansion startup
955+
+ this.skipFireCall = true;
956+
+ this.func_70015_d(0);
957+
+ this.skipFireCall = false;
958+
+ // Mist end
954959
+ }
955960
+ } else {
956961
+ // This will be called every single tick the entity is in lava, so don't throw an event
957962
+ this.setFire(15, false);
963+
+ // Mist start - Fix Infernal Expansion startup
964+
+ this.skipFireCall = true;
965+
+ this.func_70015_d(0);
966+
+ this.skipFireCall = false;
967+
+ // Mist end
958968
+ }
959969
+ // CraftBukkit end - we also don't throw an event unless the object in lava is living, to save on some event calls
960970
+ this.func_70097_a(DamageSource.field_76371_c, 4.0F);
961971
+ }
962972
+ }
963973
+
974+
+ // Mist start - Fix Infernal Expansion startup
975+
+ private boolean skipFireCall;
964976
+ public void func_70015_d(int p_70015_1_) {
977+
+ if (this.skipFireCall) {
978+
+ return;
979+
+ }
980+
+ // Mist end
965981
+ // CraftBukkit start
966982
+ this.setFire(p_70015_1_, true);
967983
+ }

0 commit comments

Comments
 (0)