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

*Fix quest Custodian of Time's script by Azrael.

Browse Source 
*and use Player(with GetPlayer()) pointer instead of Unit in the script.

--HG--
branch : trunk
This commit is contained in:
Anubisss
2009-06-17 02:19:23 +02:00
parent eba1debc3e
commit 79dd0f345d
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp
+24 -24
View File
@@ -152,34 +152,34 @@ struct TRINITY_DLL_DECL npc_custodian_of_timeAI : public npc_escortAI
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Unit *pTemp = Unit::GetUnit(*m_creature,PlayerGUID); Player *pPlayer = Unit::GetPlayer(PlayerGUID);
if( !pTemp ) if( !pPlayer )
return; return;
switch( i ) switch( i )
{ {
case 2: DoScriptText(WHISPER_CUSTODIAN_1, m_creature, pTemp); break; case 0: DoScriptText(WHISPER_CUSTODIAN_1, m_creature, pPlayer); break;
case 3: DoScriptText(WHISPER_CUSTODIAN_2, m_creature, pTemp); break; case 1: DoScriptText(WHISPER_CUSTODIAN_2, m_creature, pPlayer); break;
case 4: DoScriptText(WHISPER_CUSTODIAN_3, m_creature, pTemp); break; case 2: DoScriptText(WHISPER_CUSTODIAN_3, m_creature, pPlayer); break;
case 5: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pTemp); break; case 3: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pPlayer); break;
case 7: DoScriptText(WHISPER_CUSTODIAN_5, m_creature, pTemp); break; case 5: DoScriptText(WHISPER_CUSTODIAN_5, m_creature, pPlayer); break;
case 8: DoScriptText(WHISPER_CUSTODIAN_6, m_creature, pTemp); break; case 6: DoScriptText(WHISPER_CUSTODIAN_6, m_creature, pPlayer); break;
case 9: DoScriptText(WHISPER_CUSTODIAN_7, m_creature, pTemp); break; case 7: DoScriptText(WHISPER_CUSTODIAN_7, m_creature, pPlayer); break;
case 10: DoScriptText(WHISPER_CUSTODIAN_8, m_creature, pTemp); break; case 8: DoScriptText(WHISPER_CUSTODIAN_8, m_creature, pPlayer); break;
case 11: DoScriptText(WHISPER_CUSTODIAN_9, m_creature, pTemp); break; case 9: DoScriptText(WHISPER_CUSTODIAN_9, m_creature, pPlayer); break;
case 12: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pTemp); break; case 10: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pPlayer); break;
case 15: DoScriptText(WHISPER_CUSTODIAN_10, m_creature, pTemp); break; case 13: DoScriptText(WHISPER_CUSTODIAN_10, m_creature, pPlayer); break;
case 16: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pTemp); break; case 14: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pPlayer); break;
case 18: DoScriptText(WHISPER_CUSTODIAN_11, m_creature, pTemp); break; case 16: DoScriptText(WHISPER_CUSTODIAN_11, m_creature, pPlayer); break;
case 19: DoScriptText(WHISPER_CUSTODIAN_12, m_creature, pTemp); break; case 17: DoScriptText(WHISPER_CUSTODIAN_12, m_creature, pPlayer); break;
case 20: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pTemp); break; case 18: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pPlayer); break;
case 24: DoScriptText(WHISPER_CUSTODIAN_13, m_creature, pTemp); break; case 22: DoScriptText(WHISPER_CUSTODIAN_13, m_creature, pPlayer); break;
case 25: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pTemp); break; case 23: DoScriptText(WHISPER_CUSTODIAN_4, m_creature, pPlayer); break;
case 26: case 24:
DoScriptText(WHISPER_CUSTODIAN_14, m_creature, pTemp); DoScriptText(WHISPER_CUSTODIAN_14, m_creature, pPlayer);
DoCast(pTemp,34883); DoCast(pPlayer, 34883);
// below here is temporary workaround, to be removed when spell works properly // below here is temporary workaround, to be removed when spell works properly
CAST_PLR(pTemp)->AreaExploredOrEventHappens(10277); pPlayer->AreaExploredOrEventHappens(10277);
break; break;
} }
} }
@@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL npc_custodian_of_timeAI : public npc_escortAI
if( who->GetTypeId() == TYPEID_PLAYER ) if( who->GetTypeId() == TYPEID_PLAYER )
{ {
if( CAST_PLR(who)->HasAura(34877) && CAST_PLR(who)->GetQuestStatus(10277) == QUEST_STATUS_INCOMPLETE ) if( who->HasAura(34877) && CAST_PLR(who)->GetQuestStatus(10277) == QUEST_STATUS_INCOMPLETE )
{ {
float Radius = 10.0; float Radius = 10.0;
if( m_creature->IsWithinDistInMap(who, Radius) ) if( m_creature->IsWithinDistInMap(who, Radius) )