josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Allow traps without a spell be triggered. This fixes the bug that Sapphiron cannot be summoned.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-05 13:16:54 -05:00
parent 5041839918
commit 95bde24500
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/GameObject.cpp
+4 -5
View File
@@ -303,9 +303,6 @@ void GameObject::Update(uint32 /*p_time*/)
if(m_cooldownTime >= time(NULL)) if(m_cooldownTime >= time(NULL))
return; return;
if(!goInfo->trap.spellId)
return;
bool IsBattleGroundTrap = false; bool IsBattleGroundTrap = false;
//FIXME: this is activation radius (in different casting radius that must be selected from spell data) //FIXME: this is activation radius (in different casting radius that must be selected from spell data)
//TODO: move activated state code (cast itself) to GO_ACTIVATED, in this place only check activating and set state //TODO: move activated state code (cast itself) to GO_ACTIVATED, in this place only check activating and set state
@@ -351,10 +348,12 @@ void GameObject::Update(uint32 /*p_time*/)
if (ok) if (ok)
{ {
// some traps do not have spell but should be triggered
if(goInfo->trap.spellId)
CastSpell(ok, goInfo->trap.spellId);
//Unit *caster = owner ? owner : ok; //Unit *caster = owner ? owner : ok;
CastSpell(ok, goInfo->trap.spellId);
//caster->CastSpell(ok, goInfo->trap.spellId, true, 0, 0, GetGUID()); //caster->CastSpell(ok, goInfo->trap.spellId, true, 0, 0, GetGUID());
if(goInfo->trap.cooldown) if(goInfo->trap.cooldown)
m_cooldownTime = time(NULL) + goInfo->trap.cooldown; m_cooldownTime = time(NULL) + goInfo->trap.cooldown;
else else