*Do not trigger spells with triggers with scripts. This fixes the bug that shadow fissure of Kel'thuzad deals damage without delay.

--HG--
branch : trunk

1 files changed, 8 insertions, 3 deletions

diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp
index bcec34781b0..65e50a2e41b 100644
--- a/src/game/CreatureAISelector.cpp
+++ b/src/game/CreatureAISelector.cpp
@@ -60,12 +60,17 @@ namespace FactorySelector
                 ai_factory = ai_registry.GetRegistryItem("NullCreatureAI");
             else if(creature->isGuard())
                 ai_factory = ai_registry.GetRegistryItem("GuardAI");
-            else if(creature->HasSummonMask(SUMMON_MASK_GUARDIAN))
+            else if(creature->isGuardian())
                 ai_factory = ai_registry.GetRegistryItem("PetAI");
             else if(creature->isTotem())
                 ai_factory = ai_registry.GetRegistryItem("TotemAI");
-            else if(creature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER)
-                ai_factory = ai_registry.GetRegistryItem("NullCreatureAI");
+            else if(creature->isTrigger())
+            {
+                if(creature->m_spells[0])
+                    ai_factory = ai_registry.GetRegistryItem("TriggerAI");
+                else
+                    ai_factory = ai_registry.GetRegistryItem("NullCreatureAI");
+            }
             else if(creature->GetCreatureType() == CREATURE_TYPE_CRITTER)
                 ai_factory = ai_registry.GetRegistryItem("CritterAI");
         }