Skip to content

Commit 7ecfa21

Browse files
committed
fixed NaN mob health with crumbling armor
1 parent 13ee7bd commit 7ecfa21

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Diff for: src/main/java/me/ryleu/armornerf/ArmorNerf.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ArmorNerf implements ModInitializer {
1414
private static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
1515

1616
private static ArmorFormula armorFormula = new VanillaFormula();
17-
private static final HashMap<String, ArmorFormula> formulaRegistry = new HashMap<>();
17+
private static HashMap<String, ArmorFormula> formulaRegistry;
1818

1919
public static ArmorFormula getArmorFormula() {
2020
return armorFormula;
@@ -26,7 +26,7 @@ public static ArmorFormula getArmorFormula() {
2626
* @return Whether it is registered
2727
*/
2828
public static boolean isRegistered(String id) {
29-
return formulaRegistry.containsKey(id);
29+
return formulaRegistry == null || formulaRegistry.containsKey(id);
3030
}
3131

3232
/**
@@ -40,6 +40,8 @@ public static void registerFormula(String id, ArmorFormula formula) {
4040

4141
@Override
4242
public void onInitialize() {
43+
formulaRegistry = new HashMap<>();
44+
4345
registerFormula("vanilla", new VanillaFormula());
4446
registerFormula("toughness_disabled", new ToughnessDisabledFormula());
4547
registerFormula("flat_toughness", new FlatToughnessFormula());

Diff for: src/main/java/me/ryleu/armornerf/formula/CrumblingArmorFormula.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ public float calculate(
3131
totalDamage += itemStack.getDamage();
3232
}
3333

34-
float toughnessAdder = (armorToughness / 4F) * (1F - totalDamage / totalMaxDamage);
34+
float toughnessAdder = 0;
35+
if (totalMaxDamage > 0) {
36+
toughnessAdder = (armorToughness / 4F) * (1F - totalDamage / totalMaxDamage);
37+
}
3538

3639
return baseFormula.calculate(
3740
armorWearer,

Diff for: src/main/resources/fabric.mod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
],
2828

2929
"depends": {
30-
"minecraft": "1.21",
30+
"minecraft": ">=1.21",
3131
"java": ">=21"
3232
},
3333

0 commit comments

Comments
 (0)