From 6718104016c9404437722b55af69b21b56388738 Mon Sep 17 00:00:00 2001 From: Anubisss Date: Wed, 22 Jul 2009 01:06:30 +0200 Subject: [PATCH 1/3] *Dont allow player to use a flypoint if the player stunned or rooted. *This fix the bug that eg.: player cast Ice Block(45438) and click on a flypoint and INSTANTLY teleported to the flypoint. :) --HG-- branch : trunk --- src/game/Player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 27014c97f7..41ed488282 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -17583,8 +17583,8 @@ bool Player::ActivateTaxiPathTo(std::vector 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); From 33d8de85bde90cf69ddc9e2856ff5cb8c1b60a07 Mon Sep 17 00:00:00 2001 From: Anubisss Date: Wed, 22 Jul 2009 01:07:18 +0200 Subject: [PATCH 2/3] *More people to THANKS. --HG-- branch : trunk --- THANKS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/THANKS b/THANKS index 05a84490eb..81f3459fe3 100644 --- a/THANKS +++ b/THANKS @@ -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. From a22a9399dd7b668628caf27516916113d8d6fd5c Mon Sep 17 00:00:00 2001 From: Anubisss Date: Wed, 22 Jul 2009 02:05:29 +0200 Subject: [PATCH 3/3] *Fix door handling in Akama's script. --HG-- branch : trunk --- .../scripts/scripts/zone/black_temple/boss_illidan.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 15ac2aef46..8284c5a723 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)