[FF]: Fix Soul campfire doestn't work right #28

Crystal-Nest · Oct 5, 2023 · 24b4547 · 24b4547
1 parent 8917db9
commit 24b4547
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/fabric/gradle.properties b/fabric/gradle.properties
@@ -12,7 +12,7 @@ org.gradle.daemon = false
 
 # Mod Properties
   mod_title = Soul fire'd
-  mod_version = 3.2.0.0
+  mod_version = 3.2.0.1-final
   author = Crystal Spider
   group = crystalspider
   modid = soulfired

diff --git a/fabric/src/main/java/crystalspider/soulfired/api/FireManager.java b/fabric/src/main/java/crystalspider/soulfired/api/FireManager.java
@@ -676,10 +676,7 @@ public static boolean damageInFire(Entity entity, String fireId, String modId) {
   public static boolean damageInFire(Entity entity, Identifier fireType) {
     if (isRegisteredType(fireType)) {
       ((FireTypeChanger) entity).setFireType(fireType);
-      if (entity.age % 20 == 0) {
-        return harmOrHeal(entity, getInFireDamageSource(fireType), getDamage(fireType), getInvertHealAndHarm(fireType));
-      }
-      return false;
+      return harmOrHeal(entity, getInFireDamageSource(fireType), getDamage(fireType), getInvertHealAndHarm(fireType));
     }
     ((FireTypeChanger) entity).setFireType(DEFAULT_FIRE_TYPE);
     return harmOrHeal(entity, DEFAULT_FIRE.getInFire(), DEFAULT_FIRE.getDamage(), DEFAULT_FIRE.getInvertHealAndHarm());

diff --git a/forge/gradle.properties b/forge/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.daemon = false
 
 # Mod Properties
   mod_title = Soul fire'd
-  mod_version = 3.2.0.0
+  mod_version = 3.2.0.1-final
   author = Crystal Spider
   group = crystalspider
   modid = soulfired

diff --git a/forge/src/main/java/crystalspider/soulfired/api/FireManager.java b/forge/src/main/java/crystalspider/soulfired/api/FireManager.java
@@ -667,10 +667,7 @@ public static boolean damageInFire(Entity entity, String fireId, String modId) {
   public static boolean damageInFire(Entity entity, ResourceLocation fireType) {
     if (isRegisteredType(fireType)) {
       ((FireTypeChanger) entity).setFireType(fireType);
-      if (entity.tickCount % 20 == 0) {
-        return harmOrHeal(entity, getInFireDamageSource(fireType), getDamage(fireType), getInvertHealAndHarm(fireType));
-      }
-      return false;
+      return harmOrHeal(entity, getInFireDamageSource(fireType), getDamage(fireType), getInvertHealAndHarm(fireType));
     }
     ((FireTypeChanger) entity).setFireType(DEFAULT_FIRE_TYPE);
     return harmOrHeal(entity, DEFAULT_FIRE.getInFire(), DEFAULT_FIRE.getDamage(), DEFAULT_FIRE.getInvertHealAndHarm());

diff --git a/publish.cmd b/publish.cmd
@@ -6,3 +6,4 @@ cd ../forge
 powershell -Command "./gradlew githubRelease";
 powershell -Command "./gradlew curseforge";
 powershell -Command "./gradlew modrinth";
+pause