Bläddra i källkod

Merge pull request #4709 from IvanSavenko/genie_fix

Fix crash on casting spell by a random spellcaster (e.g. Master Genie)
Ivan Savenko 1 år sedan
förälder
incheckning
f3af32b912
1 ändrade filer med 2 tillägg och 1 borttagningar
  1. 2 1
      server/battles/BattleFlowProcessor.cpp

+ 2 - 1
server/battles/BattleFlowProcessor.cpp

@@ -571,7 +571,8 @@ void BattleFlowProcessor::onActionMade(const CBattleInfoCallback & battle, const
 		assert(activeStack != nullptr);
 		assert(actedStack != nullptr);
 
-		if(actedStack->castSpellThisTurn && SpellID(ba.spell).toSpell()->canCastWithoutSkip())
+		// NOTE: in case of random spellcaster, (e.g. Master Genie) spell has been selected by server and was not present in action received from player
+		if(actedStack->castSpellThisTurn && ba.spell.hasValue() && ba.spell.toSpell()->canCastWithoutSkip())
 		{
 			setActiveStack(battle, actedStack);
 			return;