PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-24 05:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed necromancy spell constantly spawning new entities

Browse source
This commit is contained in:
Sollace 2021-12-30 22:41:34 +02:00
parent 855c2b2a49
commit 26fb68d50f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/NecromancySpell.java
View file

@ -84,10 +84,11 @@ public class NecromancySpell extends AbstractAreaEffectSpell {
float additional = source.getWorld().getLocalDifficulty(source.getOrigin()).getLocalDifficulty() + getTraits().get(Trait.CHAOS, 0, 10); float additional = source.getWorld().getLocalDifficulty(source.getOrigin()).getLocalDifficulty() + getTraits().get(Trait.CHAOS, 0, 10);
if (--spawnCountdown > 0) { setDirty();
if (--spawnCountdown > 0 && !summonedEntities.isEmpty()) {
return true; return true;
} }
spawnCountdown = source.getWorld().random.nextInt(rainy ? 2000 : 100); spawnCountdown = 1200 + source.getWorld().random.nextInt(rainy ? 2000 : 1000);
if (summonedEntities.size() > 10 + additional) { if (summonedEntities.size() > 10 + additional) {
return true; return true;
@ -149,7 +150,7 @@ public class NecromancySpell extends AbstractAreaEffectSpell {
@Override @Override
public void toNBT(NbtCompound compound) { public void toNBT(NbtCompound compound) {
super.toNBT(compound); super.toNBT(compound);
spawnCountdown = compound.getInt("spawnCountdown"); compound.putInt("spawnCountdown", spawnCountdown);
if (summonedEntities.size() > 0) { if (summonedEntities.size() > 0) {
NbtList list = new NbtList(); NbtList list = new NbtList();
summonedEntities.forEach(ref -> list.add(ref.toNBT())); summonedEntities.forEach(ref -> list.add(ref.toNBT()));
@ -160,7 +161,7 @@ public class NecromancySpell extends AbstractAreaEffectSpell {
@Override @Override
public void fromNBT(NbtCompound compound) { public void fromNBT(NbtCompound compound) {
super.fromNBT(compound); super.fromNBT(compound);
compound.putInt("spawnCountdown", spawnCountdown); spawnCountdown = compound.getInt("spawnCountdown");
summonedEntities.clear(); summonedEntities.clear();
if (compound.contains("summonedEntities")) { if (compound.contains("summonedEntities")) {
compound.getList("summonedEntities", NbtElement.COMPOUND_TYPE).forEach(tag -> { compound.getList("summonedEntities", NbtElement.COMPOUND_TYPE).forEach(tag -> {