Upstream
/
EpicBosses
mirror of https://github.com/songoda/EpicBosses.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NPEs

This commit is contained in:
Esophose 2019-03-21 02:51:54 -06:00
parent ea480be11a
commit 9f6a409652
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin-modules/Core/src/com/songoda/epicbosses/managers/BossTauntManager.java
View File

@ -62,7 +62,9 @@ public class BossTauntManager {
List<String> messages = BossAPI.getStoredMessages(this.queue.poll());
MessageUtils.get().sendMessage(activeBossHolder.getLocation(), radius, messages);
if (messages != null) {
MessageUtils.get().sendMessage(activeBossHolder.getLocation(), radius, messages);
}
}
}.runTaskTimer(this.plugin, delay*20, delay*20);
}

14
plugin-modules/Core/src/com/songoda/epicbosses/skills/types/PotionSkillElement.java
View File

@ -10,7 +10,9 @@ import com.songoda.epicbosses.utils.potion.holder.PotionEffectHolder;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.entity.LivingEntity;
import org.bukkit.potion.PotionEffect;
import java.util.ArrayList;
import java.util.List;
/**
@ -42,6 +44,16 @@ public class PotionSkillElement implements ISkillHandler<PotionSkillElement> {
return;
}
nearbyEntities.forEach(livingEntity -> potionElements.forEach(potionElement -> livingEntity.addPotionEffect(this.potionEffectConverter.from(potionElement))));
List<PotionEffect> potionEffects = new ArrayList<>();
for (PotionEffectHolder potionElement : potionElements) {
PotionEffect potionEffect = this.potionEffectConverter.from(potionElement);
if (potionEffect != null) {
potionEffects.add(potionEffect);
} else {
Debug.debugMessage("Tried to apply invalid potion effect: " + potionElement.getType());
}
}
nearbyEntities.forEach(nearby -> potionEffects.forEach(nearby::addPotionEffect));
}
}