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

Fixed mind swap not properly being reverted when the caster dies

Browse source
This commit is contained in:
Sollace 2022-10-13 19:55:24 +02:00
parent a8e1c66e0f
commit 8e12c683b8
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/MindSwapSpell.java
View file

@ -48,6 +48,7 @@ public class MindSwapSpell extends MimicSpell {
other.playSound(USounds.SPELL_MINDSWAP_UNSWAP, 1); other.playSound(USounds.SPELL_MINDSWAP_UNSWAP, 1);
caster.playSound(USounds.SPELL_MINDSWAP_UNSWAP, 1); caster.playSound(USounds.SPELL_MINDSWAP_UNSWAP, 1);
}); });
counterpart.set(null);
} }
} }
@ -81,6 +82,15 @@ public class MindSwapSpell extends MimicSpell {
setDead(); setDead();
return false; return false;
} }
if (!caster.getEntity().isAlive()) {
counterpart.ifPresent(caster.getReferenceWorld(), e -> {
e.damage(DamageSource.MAGIC, Float.MAX_VALUE);
});
onDestroyed(caster);
setDead();
return false;
}
} }
return super.tick(caster, situation); return super.tick(caster, situation);