Merge branch 'master' into 4.3.4
Conflicts: src/server/game/Battlefield/Zones/BattlefieldWG.cpp src/server/game/Conditions/ConditionMgr.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/SpellEffects.cpp src/server/scripts/EasternKingdoms/stormwind_city.cpp src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp src/server/scripts/Kalimdor/azshara.cpp
This commit is contained in:
commit
8ae0f2332c
67 files changed
+3559
-1434
No files matched your search
@@ -936,16 +936,9 @@ public:
|
||||
//No args required for players
|
||||
if (handler->GetSession() && AccountMgr::IsPlayerAccount(handler->GetSession()->GetSecurity()))
|
||||
{
|
||||
Player* player = handler->GetSession()->GetPlayer();
|
||||
if (player->isInFlight() || player->isInCombat())
|
||||
{
|
||||
handler->SendSysMessage(LANG_CANT_DO_NOW);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
//7355: "Stuck"
|
||||
player->CastSpell(player, 7355, false);
|
||||
// 7355: "Stuck"
|
||||
if (Player* player = handler->GetSession()->GetPlayer())
|
||||
player->CastSpell(player, 7355, false);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -966,8 +959,13 @@ public:
|
||||
|
||||
if (player->isInFlight() || player->isInCombat())
|
||||
{
|
||||
handler->SendSysMessage(LANG_CANT_DO_NOW);
|
||||
handler->SetSentErrorMessage(true);
|
||||
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(7355);
|
||||
if (!spellInfo)
|
||||
return false;
|
||||
|
||||
if (Player* caster = handler->GetSession()->GetPlayer())
|
||||
Spell::SendCastResult(caster, spellInfo, 0, SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user