diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp | 1 | ||||
| -rw-r--r-- | src/game/Creature.cpp | 6 | ||||
| -rw-r--r-- | src/game/Creature.h | 2 | ||||
| -rw-r--r-- | src/game/Player.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 3 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp index d9cc67afcbb..81902635505 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp @@ -347,7 +347,6 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI if(!ChannelerList.empty()) { - Channelers.clear(); for(std::list<Creature*>::iterator itr = ChannelerList.begin(); itr != ChannelerList.end(); ++itr) { ((mob_ashtongue_channelerAI*)(*itr)->AI())->ShadeGUID = m_creature->GetGUID(); diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 0fb26de1321..c0065212207 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -744,7 +744,7 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const return true; } -bool Creature::isCanIneractWithBattleMaster(Player* pPlayer, bool msg) const +bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const { if(!isBattleMaster()) return false; @@ -846,7 +846,7 @@ void Creature::prepareGossipMenu( Player *pPlayer,uint32 gossipid ) return; break; case GOSSIP_OPTION_BATTLEFIELD: - if(!isCanIneractWithBattleMaster(pPlayer,false)) + if(!isCanInteractWithBattleMaster(pPlayer,false)) cantalking=false; break; case GOSSIP_OPTION_SPIRITGUIDE: @@ -898,7 +898,7 @@ void Creature::prepareGossipMenu( Player *pPlayer,uint32 gossipid ) } if(HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_BATTLEMASTER)) { - isCanIneractWithBattleMaster(pPlayer,true); // output error message if need + isCanInteractWithBattleMaster(pPlayer,true); // output error message if need } } } diff --git a/src/game/Creature.h b/src/game/Creature.h index 7c8ad79b608..1ae41b86776 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -436,7 +436,7 @@ class TRINITY_DLL_SPEC Creature : public Unit bool HasReactState(ReactStates state) const { return (m_reactState == state); } ///// TODO RENAME THIS!!!!! bool isCanTrainingOf(Player* player, bool msg) const; - bool isCanIneractWithBattleMaster(Player* player, bool msg) const; + bool isCanInteractWithBattleMaster(Player* player, bool msg) const; bool isCanTrainingAndResetTalentsOf(Player* pPlayer) const; bool IsOutOfThreatArea(Unit* pVictim) const; bool IsImmunedToSpell(SpellEntry const* spellInfo, bool useCharges = false); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index d2d2bbafe4e..4b187023be4 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16317,7 +16317,7 @@ void Player::Whisper(const std::string& text, uint32 language,uint64 receiver) ChatHandler(this).PSendSysMessage(LANG_PLAYER_DND, rPlayer->GetName(), rPlayer->dndMsg.c_str()); } - if(!isAcceptWhispers()) + if(!isAcceptWhispers() && !isGameMaster() && !rPlayer->isGameMaster()) { SetAcceptWhispers(true); ChatHandler(this).SendSysMessage(LANG_COMMAND_WHISPERON); diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index e713116ac15..47bb47ce8b4 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1783,7 +1783,8 @@ void SpellMgr::LoadSpellScriptTarget() bar.step(); sLog.outString(); - sLog.outErrorDb(">> Loaded 0 SpellScriptTarget. DB table `spell_script_target` is empty."); + sLog.outString( ">> Loaded 0 spell script target" ); + sLog.outErrorDb("`spell_script_target` table is empty!"); return; } |