Merge pull request #795 from TonytheMacaroni/main

Remove totems on stop, allow totems to be cleansed by CleanseSpell

Author: Chronoken

core/src/main/java/com/nisovin/magicspells/spells/targeted/CleanseSpell.java

@@ -25,6 +25,7 @@ public class CleanseSpell extends TargetedSpell implements TargetedEntitySpell {
 	private final List<BuffSpell> buffSpells;
 	private final List<LoopSpell> loopSpells;
 	private final List<OrbitSpell> orbitSpells;
+	private final List<TotemSpell> totemSpells;
 	private final List<SilenceSpell> silenceSpells;
 	private final List<LevitateSpell> levitateSpells;
 	private final List<PotionEffectType> potionEffectTypes;
@@ -40,6 +41,7 @@ public CleanseSpell(MagicConfig config, String spellName) {
 		buffSpells = new ArrayList<>();
 		loopSpells = new ArrayList<>();
 		orbitSpells = new ArrayList<>();
+		totemSpells = new ArrayList<>();
 		silenceSpells = new ArrayList<>();
 		levitateSpells = new ArrayList<>();
 		potionEffectTypes = new ArrayList<>();
@@ -104,6 +106,18 @@ public void initialize() {
 				continue;
 			}
 
+			if (s.startsWith("totem:")) {
+				if (s.replace("totem:", "").equalsIgnoreCase("*")) {
+					for (Spell spell : MagicSpells.getSpellsOrdered()) {
+						if (spell instanceof TotemSpell) totemSpells.add((TotemSpell) spell);
+					}
+					continue;
+				}
+				Spell spell = MagicSpells.getSpellByInternalName(s.replace("totem:", ""));
+				if (spell instanceof TotemSpell) totemSpells.add((TotemSpell) spell);
+				continue;
+			}
+
 			if (s.startsWith("silence:")) {
 				if (s.replace("silence:", "").equalsIgnoreCase("*")) {
 					for (Spell spell : MagicSpells.getSpellsOrdered()) {
@@ -167,6 +181,10 @@ public void initialize() {
 				if (spell.hasOrbit(entity)) return true;
 			}
 
+			for (TotemSpell spell : totemSpells) {
+				if (spell.hasTotem(entity)) return true;
+			}
+
 			for (SilenceSpell spell : silenceSpells) {
 				if (spell.isSilenced(entity)) return true;
 			}
@@ -207,6 +225,7 @@ public CastResult castAtEntity(SpellData data) {
 		stunSpells.forEach(spell -> spell.removeStun(target));
 		loopSpells.forEach(spell -> spell.cancelLoops(target));
 		orbitSpells.forEach(spell -> spell.removeOrbits(target));
+		totemSpells.forEach(spell -> spell.removeTotems(target));
 		silenceSpells.forEach(spell -> spell.removeSilence(target));
 		levitateSpells.forEach(spell -> spell.removeLevitate(target));
 

core/src/main/java/com/nisovin/magicspells/spells/targeted/TotemSpell.java

@@ -186,9 +186,7 @@ public void initialize() {
 
 	@Override
 	public void turnOff() {
-		for (Totem t : totems) {
-			t.stop();
-		}
+		for (Totem t : totems) t.stop(false);
 
 		totems.clear();
 		ticker.stop();
@@ -258,12 +256,7 @@ private void createTotem(SpellData data) {
 		totems.add(totem);
 
 		int maxDuration = this.maxDuration.get(data);
-		if (maxDuration > 0) {
-			MagicSpells.scheduleDelayedTask(() -> {
-				totem.stop();
-				totems.remove(totem);
-			}, maxDuration);
-		}
+		if (maxDuration > 0) MagicSpells.scheduleDelayedTask(totem::stop, maxDuration);
 
 		ticker.start();
 		playSpellEffects(data);
@@ -272,14 +265,7 @@ private void createTotem(SpellData data) {
 	@EventHandler
 	public void onPlayerDeath(PlayerDeathEvent event) {
 		if (totems.isEmpty()) return;
-		Player player = event.getEntity();
-		Iterator<Totem> iter = totems.iterator();
-		while (iter.hasNext()) {
-			Totem pulser = iter.next();
-			if (!pulser.data.caster().equals(player)) continue;
-			pulser.stop();
-			iter.remove();
-		}
+		removeTotems(event.getPlayer());
 	}
 
 	@EventHandler
@@ -301,6 +287,25 @@ public void onArmorStandManipulate(PlayerArmorStandManipulateEvent e) {
 		}
 	}
 
+	public boolean hasTotem(LivingEntity caster) {
+		for (Totem totem : totems)
+			if (caster.equals(totem.data.caster()))
+				return true;
+
+		return false;
+	}
+
+	public void removeTotems(LivingEntity caster) {
+		Iterator<Totem> it = totems.iterator();
+		while (it.hasNext()) {
+			Totem totem = it.next();
+			if (caster.equals(totem.data.caster())) {
+				totem.stop(false);
+				it.remove();
+			}
+		}
+	}
+
 	private class Totem {
 
 		private final ArmorStand armorStand;
@@ -393,8 +398,13 @@ private boolean activate() {
 		}
 
 		private void stop() {
+			stop(true);
+		}
+
+		private void stop(boolean remove) {
 			if (!totemLocation.getChunk().isLoaded()) totemLocation.getChunk().load();
 			armorStand.remove();
+			if (remove) totems.remove(this);
 			playSpellEffects(EffectPosition.DISABLED, totemLocation, data);
 			if (spellOnBreak != null) spellOnBreak.subcast(data);
 		}