mirror of
https://github.com/GTNewHorizons/Gravitation-Suite-Neo.git
synced 2026-10-25 20:22:30 +00:00
Disabled fire extinguishing for Advanced NanoChestPlate and GraviChestPlate if fire resistance is active (#29)
This commit is contained in:
1 parent
64a9ddfb62
commit
c6aa859e4c
2 files changed
+5
-1
No files matched your search
+2
@@ -2,6 +2,7 @@ package com.gtnewhorizons.gravisuiteneo.mixins;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
@@ -69,6 +70,7 @@ public class MixinItemAdvancedNanoChestPlate extends ItemAdvancedJetPack impleme
|
||||
byte currentTick = ticker;
|
||||
ticker = (byte) (currentTick + 1);
|
||||
if (currentTick % tickRate == 0 && player.isBurning()
|
||||
&& !player.isPotionActive(Potion.fireResistance)
|
||||
&& ElectricItem.manager.canUse(itemStack, energyForExtinguish)) {
|
||||
ItemAdvancedJetPack.use(itemStack, energyForExtinguish);
|
||||
player.extinguish();
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.util.List;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
@@ -74,7 +75,8 @@ public class MixinItemGraviChestPlate implements IHazardProtector {
|
||||
remap = false)
|
||||
private boolean gravisuiteneo$checkCanExtinguish(boolean original, World worldObj, EntityPlayer player,
|
||||
ItemStack itemStack) {
|
||||
if (original && ElectricItem.manager.canUse(itemStack, QuantumShieldHelper.DISCHARGE_EXTINGUISH)) {
|
||||
if (original && ElectricItem.manager.canUse(itemStack, QuantumShieldHelper.DISCHARGE_EXTINGUISH)
|
||||
&& !player.isPotionActive(Potion.fireResistance)) {
|
||||
ElectricItem.manager.discharge(itemStack, QuantumShieldHelper.DISCHARGE_EXTINGUISH, 4, true, false, false);
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user