|
69 | 69 | import net.minecraft.entity.player.PlayerEntity;
|
70 | 70 | import net.minecraft.entity.player.ServerPlayerEntity;
|
71 | 71 | import net.minecraft.fluid.Fluid;
|
72 |
| -@@ -106,2709 +_,3345 @@ |
| 72 | +@@ -106,2709 +_,3361 @@ |
73 | 73 | import net.minecraft.world.server.TicketType;
|
74 | 74 | import net.minecraftforge.api.distmarker.Dist;
|
75 | 75 | import net.minecraftforge.api.distmarker.OnlyIn;
|
|
951 | 951 | + this.field_70170_p.getCBServer().getPluginManager().callEvent(combustEvent);
|
952 | 952 | + if (!combustEvent.isCancelled()) {
|
953 | 953 | + 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 |
954 | 959 | + }
|
955 | 960 | + } else {
|
956 | 961 | + // This will be called every single tick the entity is in lava, so don't throw an event
|
957 | 962 | + 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 |
958 | 968 | + }
|
959 | 969 | + // CraftBukkit end - we also don't throw an event unless the object in lava is living, to save on some event calls
|
960 | 970 | + this.func_70097_a(DamageSource.field_76371_c, 4.0F);
|
961 | 971 | + }
|
962 | 972 | + }
|
963 | 973 | +
|
| 974 | ++ // Mist start - Fix Infernal Expansion startup |
| 975 | ++ private boolean skipFireCall; |
964 | 976 | + public void func_70015_d(int p_70015_1_) {
|
| 977 | ++ if (this.skipFireCall) { |
| 978 | ++ return; |
| 979 | ++ } |
| 980 | ++ // Mist end |
965 | 981 | + // CraftBukkit start
|
966 | 982 | + this.setFire(p_70015_1_, true);
|
967 | 983 | + }
|
|
0 commit comments