aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2016-06-02 00:31:32 +0200
committerjackpoz <giacomopoz@gmail.com>2016-06-02 00:31:32 +0200
commit6007f2a6a0ac13dcac80d0dbc8e1e00ef5d0e9ce (patch)
treea8d4c3837aeabfaddcb8ec52141a8823f67a2546
parent8fe85017125803a4ca8fd1d972b128930cd364b9 (diff)
parent9803e58392eea0828aac96cd79a794a77323d9d0 (diff)
Merge pull request #17259 from SnapperRy/smart_ai
Core/SmartAI: Allow SMART_ACTION_FORCE_DESPAWN on no-SmartAI GameObjects
-rw-r--r--src/server/game/AI/SmartScripts/SmartScript.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index a18f0a6574b..7c258e09b09 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
@@ -1037,10 +1037,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
target->DespawnOrUnsummon(e.action.forceDespawn.delay);
}
else if (GameObject* goTarget = (*itr)->ToGameObject())
- {
- if (IsSmartGO(goTarget))
- goTarget->SetRespawnTime(e.action.forceDespawn.delay + 1);
- }
+ goTarget->SetRespawnTime(e.action.forceDespawn.delay + 1);
}
delete targets;