fix: add creature buckets to iron items

fix: WATER_BREATHING no longer saves from full submersion
Sigmarik · Jul 5, 2023 · b8cf6c5 · b8cf6c5
1 parent 3855383
commit b8cf6c5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/net/sigmarik/abilitymod/mixin/PlayerEntityMixin.java b/src/main/java/net/sigmarik/abilitymod/mixin/PlayerEntityMixin.java
@@ -48,7 +48,7 @@ private boolean hasTrait(String trait) {
     private void tickFearOfWater() {
         if (!hasTrait(Traits.FEAR_OF_WATER) || !isWet()) return;
 
-        if (hasStatusEffect(StatusEffects.WATER_BREATHING)) return;
+        if (hasStatusEffect(StatusEffects.WATER_BREATHING) && !isSubmergedInWater()) return;
 
         damage(getDamageSources().magic(), 3);
     }

diff --git a/src/main/java/net/sigmarik/abilitymod/util/PropSets.java b/src/main/java/net/sigmarik/abilitymod/util/PropSets.java
@@ -90,6 +90,12 @@ public class PropSets {
             Items.TNT_MINECART,
             Items.TRAPPED_CHEST,
             Items.TRIPWIRE_HOOK,
-            Items.WATER_BUCKET
+            Items.WATER_BUCKET,
+
+            Items.COD_BUCKET,
+            Items.PUFFERFISH_BUCKET,
+            Items.SALMON_BUCKET,
+            Items.TADPOLE_BUCKET,
+            Items.TROPICAL_FISH_BUCKET
     );
 }