Merge remote-tracking branch 'origin/master' into release

src/server/components/spellbook.js

@@ -409,6 +409,13 @@ module.exports = {
 		return didCast || isCasting;
 	},
 
+	//Callbacks to be called when this object is destroyed
+	registerDestroyCallback: function (callback) {
+		this.callbacks.push({
+			cbOnSelfDestroyed: callback
+		});
+	},
+
 	registerCallback: function (sourceId, callback, time, destroyCallback, targetId, destroyOnRezone) {
 		let obj = {
 			sourceId: sourceId,
@@ -508,8 +515,8 @@ module.exports = {
 
 	destroy: function () {
 		this.callbacks.forEach(c => {
-			if (c.destroyCallback)
-				c.destroyCallback();
+			if (c.cbOnSelfDestroyed)
+				c.cbOnSelfDestroyed();
 		});
 
 		this.spells.forEach(s => {

src/server/config/spells/spellCharge.js

@@ -87,10 +87,12 @@ module.exports = {
 
 		this.queueCallback(
 			this.reachDestination.bind(this, target, targetPos, targetEffect, selfEffect),
-			ttl - 50,
-			this.destroyEffectOnTarget.bind(this, target, targetEffect)
+			ttl - 50
 		);
 
+		//To be called when the object is destroyed
+		this.obj.spellbook.registerDestroyCallback(this.destroyEffectOnTarget.bind(this, target, targetEffect));
+
 		return true;
 	},
 
@@ -147,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) {

src/server/config/spells/spellFireblast.js

@@ -148,9 +148,12 @@ module.exports = {
 					this.queueCallback(
 						this.endEffect.bind(this, m, targetPos, targetEffect),
 						ttl,
-						this.destroyEffectOnTarget.bind(this, m, targetEffect),
+						null,
 						m
 					);
+
+					//To be called when the object is destroyed
+					this.obj.spellbook.registerDestroyCallback(this.destroyEffectOnTarget.bind(this, m, targetEffect));
 				}
 			}
 		}
@@ -208,6 +211,7 @@ module.exports = {
 	},
 
 	destroyEffectOnTarget: function (target, targetEffect) {
-		target.effects.removeEffect(targetEffect.id);
+		if (targetEffect)
+			target.effects.removeEffect(targetEffect.id);
 	}
 };