Merge remote-tracking branch 'origin/bru-gas-masks' into bru-gas-masks

SymmetricDevs · Jan 13, 2025 · 82f7570 · 82f7570
2 parents ffe7663 + 8bde6d6
commit 82f7570
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main/java/supersymmetry/common/item/armor/AdvancedBreathingApparatus.java b/src/main/java/supersymmetry/common/item/armor/AdvancedBreathingApparatus.java
@@ -65,11 +65,6 @@ public double tryTick(ItemStack stack, EntityPlayer player) {
         ItemStack chest = player.getItemStackFromSlot(CHEST);
         if (chest.getItem() instanceof SuSyArmorItem item) {
             if (item.getItem(chest).getArmorLogic() instanceof AdvancedBreathingApparatus tank && tank.tier == tier) {
-                if (tank.getOxygen(chest) <= 0) {
-                    return 0.0625;
-                } else {
-                    tank.changeOxygen(chest, -1.);
-                }
                 tank.handleDamage(chest, player);
 
                 int piecesCount = 0;
@@ -88,6 +83,12 @@ public double tryTick(ItemStack stack, EntityPlayer player) {
                         piecesCount++;
                     }
                 }
+
+                if (tank.getOxygen(chest) <= 0) {
+                    return 0.0625;
+                } else {
+                    tank.changeOxygen(chest, -1.);
+                }
                 switch (piecesCount) {
                     case 0:
                         return 0.5;