Fixed ability spells not cancelling when the player loses access to t…

…he granting ability. Fixes #272
Sollace · Feb 21, 2024 · 00a20fb · 00a20fb
1 parent 53497c7
commit 00a20fb
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java
@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import com.minelittlepony.unicopia.*;
+import com.minelittlepony.unicopia.ability.Ability;
 import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
 import com.minelittlepony.unicopia.entity.*;
 import com.minelittlepony.unicopia.entity.damage.UDamageSources;
@@ -103,6 +104,10 @@ default boolean canCastAt(Vec3d pos) {
         return !Ether.get(asWorld()).anyMatch(SpellType.ARCANE_PROTECTION, (spell, caster) -> spell.blocksMagicFor(caster, this, pos));
     }
 
+    default boolean canUse(Ability<?> ability) {
+        return false;
+    }
+
     static Stream<Caster<?>> stream(Stream<Entity> entities) {
         return entities.map(Caster::of).flatMap(Optional::stream);
     }

diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/DispersableDisguiseSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/DispersableDisguiseSpell.java
@@ -2,6 +2,7 @@
 
 import java.util.Optional;
 
+import com.minelittlepony.unicopia.ability.Abilities;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.IllusionarySpell;
 import com.minelittlepony.unicopia.ability.magic.spell.effect.CustomisedSpellType;
@@ -55,6 +56,10 @@ public boolean update(Caster<?> source, boolean tick) {
             }
         }
 
+        if (!source.canUse(Abilities.DISGUISE)) {
+            setDead();
+        }
+
         Entity owner = source.asEntity();
         Entity appearance = getDisguise().getAppearance();
 

diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RageAbilitySpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RageAbilitySpell.java
@@ -2,6 +2,7 @@
 
 import com.minelittlepony.unicopia.InteractionManager;
 import com.minelittlepony.unicopia.USounds;
+import com.minelittlepony.unicopia.ability.Abilities;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.spell.effect.*;
 import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation;
@@ -45,7 +46,7 @@ public void setExtenguishing() {
     @Override
     public boolean tick(Caster<?> source, Situation situation) {
 
-        if (situation != Situation.BODY || source.asEntity().isRemoved()) {
+        if (situation != Situation.BODY || source.asEntity().isRemoved() || !source.canUse(Abilities.RAGE)) {
             return false;
         }
 

diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RainboomAbilitySpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RainboomAbilitySpell.java
@@ -4,6 +4,7 @@
 
 import com.minelittlepony.unicopia.InteractionManager;
 import com.minelittlepony.unicopia.UTags;
+import com.minelittlepony.unicopia.ability.Abilities;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.spell.effect.*;
 import com.minelittlepony.unicopia.entity.damage.UDamageTypes;
@@ -43,7 +44,7 @@ public RainboomAbilitySpell(CustomisedSpellType<?> type) {
     @Override
     public boolean tick(Caster<?> source, Situation situation) {
 
-        if (situation != Situation.BODY) {
+        if (situation != Situation.BODY || !source.canUse(Abilities.RAINBOOM)) {
             return false;
         }
 

diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/TimeControlAbilitySpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/TimeControlAbilitySpell.java
@@ -4,7 +4,6 @@
 import com.minelittlepony.unicopia.ability.data.Rot;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.spell.effect.*;
-import com.minelittlepony.unicopia.entity.player.Pony;
 import com.minelittlepony.unicopia.server.world.UGameRules;
 import com.minelittlepony.unicopia.server.world.UnicopiaWorldProperties;
 
@@ -31,11 +30,7 @@ public TimeControlAbilitySpell(CustomisedSpellType<?> type) {
     @Override
     public boolean tick(Caster<?> source, Situation situation) {
 
-        if (!source.asWorld().getGameRules().getBoolean(UGameRules.DO_TIME_MAGIC)) {
-            return false;
-        }
-
-        if (situation != Situation.BODY || !(source instanceof Pony pony) || !Abilities.TIME.canUse(pony.getCompositeRace())) {
+        if (!source.asWorld().getGameRules().getBoolean(UGameRules.DO_TIME_MAGIC) || situation != Situation.BODY || !source.canUse(Abilities.TIME)) {
             return false;
         }
 

diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Living.java b/src/main/java/com/minelittlepony/unicopia/entity/Living.java
@@ -10,6 +10,7 @@
 import com.minelittlepony.unicopia.UTags;
 import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.ability.Abilities;
+import com.minelittlepony.unicopia.ability.Ability;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.SpellContainer;
 import com.minelittlepony.unicopia.ability.magic.SpellPredicate;
@@ -614,6 +615,11 @@ public void updateVelocity() {
         updateVelocity(entity);
     }
 
+    @Override
+    public boolean canUse(Ability<?> ability) {
+        return ability.canUse(getCompositeRace());
+    }
+
     public static Optional<Living<?>> getOrEmpty(Entity entity) {
         return Equine.of(entity, a -> a instanceof Living);
     }