From 6b7d8c4d6f24c84ef47c2bfbba7186bf4ab64de6 Mon Sep 17 00:00:00 2001
From: Shaun <skichenbrand@gmail.com>
Date: Thu, 14 Mar 2024 12:56:13 +0200
Subject: [PATCH] bug #2022

---
 src/server/config/spells/spellCharge.js    | 3 ++-
 src/server/config/spells/spellFireblast.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/server/config/spells/spellCharge.js b/src/server/config/spells/spellCharge.js
index 53978f71..4d9b446c 100644
--- a/src/server/config/spells/spellCharge.js
+++ b/src/server/config/spells/spellCharge.js
@@ -149,7 +149,8 @@ module.exports = {
 	},
 
 	destroyEffectOnTarget: function (target, targetEffect) {
-		target.effects.removeEffect(targetEffect.id);
+		if (targetEffect)
+			target.effects.removeEffect(targetEffect.id);
 	},
 
 	isTileValid: function (physics, fromX, fromY, toX, toY) {
diff --git a/src/server/config/spells/spellFireblast.js b/src/server/config/spells/spellFireblast.js
index f7a8dff1..a4a1edd9 100644
--- a/src/server/config/spells/spellFireblast.js
+++ b/src/server/config/spells/spellFireblast.js
@@ -211,6 +211,7 @@ module.exports = {
 	},
 
 	destroyEffectOnTarget: function (target, targetEffect) {
-		target.effects.removeEffect(targetEffect.id);
+		if (targetEffect)
+			target.effects.removeEffect(targetEffect.id);
 	}
 };