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

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-07-22 17:11:20 +02:00
parent 2ff21d4cef a22a9399dd
commit 8e44d673b9
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
+5 -5
View File
@@ -999,10 +999,10 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
DoorGUID[0] = pInstance->GetData64(DATA_GAMEOBJECT_ILLIDAN_DOOR_R);
DoorGUID[1] = pInstance->GetData64(DATA_GAMEOBJECT_ILLIDAN_DOOR_L);
pInstance->HandleGameObject(pInstance->GetData64(GateGUID), false);
pInstance->HandleGameObject(GateGUID, false);
for(uint8 i = 0; i < 2; i++)
pInstance->HandleGameObject(pInstance->GetData64(DoorGUID[i]), false);
pInstance->HandleGameObject(DoorGUID[i], false);
}
else
@@ -1073,7 +1073,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, IN_PROGRESS);
for(uint8 i = 0; i < 2; i++)
pInstance->HandleGameObject(pInstance->GetData64(DoorGUID[i]), false);
pInstance->HandleGameObject(DoorGUID[i], false);
if(GETCRE(Illidan, IllidanGUID))
{
@@ -1238,7 +1238,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
m_creature->InterruptNonMeleeSpells(true);
Spirit[0]->InterruptNonMeleeSpells(true);
Spirit[1]->InterruptNonMeleeSpells(true);
pInstance->HandleGameObject(pInstance->GetData64(GateGUID), true);
pInstance->HandleGameObject(GateGUID, true);
Timer = 2000;
break;
case 4:
@@ -1268,7 +1268,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
{
case 6:
for(uint8 i = 0; i < 2; i++)
pInstance->HandleGameObject(pInstance->GetData64(DoorGUID[i]), true);
pInstance->HandleGameObject(DoorGUID[i], true);
break;
case 8:
if(Phase == PHASE_WALK)
src/game/Player.cpp
+2 -2
View File
@@ -17583,8 +17583,8 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
if(nodes.size() < 2)
return false;
// not let cheating with start flight in time of logout process || if casting not finished || while in combat || if not use Spell's with EffectSendTaxi
if(GetSession()->isLogingOut() || isInCombat())
// not let cheating with start flight in time of logout process || while in combat || has type state: stunned || has type state: root
if(GetSession()->isLogingOut() || isInCombat() || hasUnitState(UNIT_STAT_STUNNED) || hasUnitState(UNIT_STAT_ROOT))
{
WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
data << uint32(ERR_TAXIPLAYERBUSY);