fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't decrement spell index if spells haven't been initialised, and add the missing safety check to getCurrentMaxCooldown - fixes #428

Browse Source
This commit is contained in:
Electroblob77
2020-05-13 12:06:41 +01:00
parent 9205f082f1
commit fe5060a2c0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/util/WandHelper.java
+2 -2
View File
@@ -217,7 +217,7 @@ public final class WandHelper {
int spellIndex = wand.getTagCompound().getInteger(SELECTED_SPELL_KEY); int spellIndex = wand.getTagCompound().getInteger(SELECTED_SPELL_KEY);
if(spellIndex <= 0){ if(spellIndex <= 0){
spellIndex = numberOfSpells - 1; spellIndex = Math.max(0, numberOfSpells - 1);
}else{ }else{
spellIndex--; spellIndex--;
} }
@@ -370,7 +370,7 @@ public final class WandHelper {
int selectedSpell = wand.getTagCompound().getInteger(SELECTED_SPELL_KEY); int selectedSpell = wand.getTagCompound().getInteger(SELECTED_SPELL_KEY);
if(cooldowns.length <= selectedSpell) return 0; if(selectedSpell < 0 || cooldowns.length <= selectedSpell) return 0;
return cooldowns[selectedSpell]; return cooldowns[selectedSpell];
} }