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

Move archivist's eyeglass code inside null check, fixes NPE when generating loot

Browse Source
This commit is contained in:
Electroblob77
2020-07-06 17:47:03 +01:00
parent e04e1e70af
commit 48221582c3
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/loot/RandomSpell.java
+16 -12
View File
@@ -152,21 +152,25 @@ public class RandomSpell extends LootFunction {
possibleSpells.removeIf(s -> s.getElement() != element); possibleSpells.removeIf(s -> s.getElement() != element);
if(possibleSpells.isEmpty()) return Spells.none; // If it fails anywhere, it'll most likely be here if(possibleSpells.isEmpty()) return Spells.none; // If it fails anywhere, it'll most likely be here
float bias = undiscoveredBias; if(player != null){
// Archivist's eyeglass increases undiscovered bias by 0.4 up to a maximum of 0.9
if(ItemArtefact.isArtefactActive(player, WizardryItems.charm_spell_discovery)) bias = Math.min(bias + 0.4f, 0.9f);
// Remove either the undiscovered spells or the discovered ones, depending on the bias float bias = undiscoveredBias;
if(bias > 0 && player != null){ // Archivist's eyeglass increases undiscovered bias by 0.4 up to a maximum of 0.9
if(ItemArtefact.isArtefactActive(player, WizardryItems.charm_spell_discovery))
bias = Math.min(bias + 0.4f, 0.9f);
WizardData data = WizardData.get(player); // Remove either the undiscovered spells or the discovered ones, depending on the bias
if(bias > 0){
int discoveredCount = (int)possibleSpells.stream().filter(data::hasSpellBeenDiscovered).count(); WizardData data = WizardData.get(player);
// If none have been discovered or they've all been discovered, don't bother!
if(discoveredCount > 0 && discoveredCount < possibleSpells.size()){ int discoveredCount = (int)possibleSpells.stream().filter(data::hasSpellBeenDiscovered).count();
// Kinda unintuitive but it's very neat! // If none have been discovered or they've all been discovered, don't bother!
boolean keepDiscovered = random.nextFloat() > 0.5f + 0.5f * bias; if(discoveredCount > 0 && discoveredCount < possibleSpells.size()){
possibleSpells.removeIf(s -> keepDiscovered != data.hasSpellBeenDiscovered(s)); // Kinda unintuitive but it's very neat!
boolean keepDiscovered = random.nextFloat() > 0.5f + 0.5f * bias;
possibleSpells.removeIf(s -> keepDiscovered != data.hasSpellBeenDiscovered(s));
}
} }
} }