diff options
| -rw-r--r-- | THANKS | 3 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp | 10 | ||||
| -rw-r--r-- | src/game/Player.cpp | 4 |
3 files changed, 9 insertions, 8 deletions
@@ -47,4 +47,5 @@ Moandor, ebx, DasBlub, guenex, Brats, Lucy, arcx, Enril, oiler2112, Wizz, Elminster, 123qwe, NeatElves, Turk3y, deicide, vladonix, nugu100, Skystar, Reve, jorooo, FrozenDB, miranda.conrado, Tequila, Gommes, Zerg2000, aerione_alt, Rastik, FrenchW, wilibald09, Velorien, kancaras, fisherman, -Aviram, Mufik, loop69, multiplexer, Koani, rechapa79, kozelo. +Aviram, Mufik, loop69, multiplexer, Koani, rechapa79, kozelo, MeanMachine, +fregh, adrycasillo, IncoGnito. diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index 15ac2aef462..8284c5a7238 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -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) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 27014c97f76..41ed4882826 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -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); |