diff options
-rw-r--r-- | sql/updates/4276_world_TDB.sql | 14 | ||||
-rw-r--r-- | src/game/Level1.cpp | 2 | ||||
-rw-r--r-- | src/game/Level2.cpp | 9 | ||||
-rw-r--r-- | src/game/Player.cpp | 1 | ||||
-rw-r--r-- | src/game/Spell.cpp | 2 |
5 files changed, 22 insertions, 6 deletions
diff --git a/sql/updates/4276_world_TDB.sql b/sql/updates/4276_world_TDB.sql new file mode 100644 index 00000000000..ea9df1a069b --- /dev/null +++ b/sql/updates/4276_world_TDB.sql @@ -0,0 +1,14 @@ +REPLACE INTO gameobject_template VALUES (178925,1,5651,"Alliance Banner","","","",83,0,1,0,0,0,0,0,1479,196608,180421,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (178943,1,5652,"Horde Banner","","","",84,0,1,0,0,0,0,0,1479,196608,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (178940,1,5653,"Contested Banner","","","",83,0,1,0,0,0,0,0,1479,196608,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (179435,1,5654,"Contested Banner","","","",84,0,1,0,0,0,0,0,1479,196608,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (178365,1,5771,"Alliance Banner","","","",83,0,1,0,0,0,0,0,1479,196608,180100,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (179286,1,5772,"Contested Banner","","","",83,0,1,0,0,0,0,0,1479,196608,180102,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (179287,1,5774,"Contested Banner","","","",84,0,1,0,0,0,0,0,1479,0,180102,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (180418,1,6211,"Snowfall Banner","","","",0,0,1,0,0,0,0,0,1479,196608,180100,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (180100,6,2232,"Alliance Banner Aura","","","",0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (180102,6,266,"Neutral Banner Aura","","","",0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (180101,6,1311,"Horde Banner Aura","","","",0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (180421,6,2232,"Alliance Banner Aura, Large","","","",0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (180423,6,266,"Neutral Banner Aura, Large","","","",0,0,5,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (180422,6,1311,"Horde Banner Aura, Large","","","",0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,""); diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 0317a6c3e22..9ec47381f61 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -846,7 +846,7 @@ bool ChatHandler::HandleNamegoCommand(const char* args) PSendSysMessage(LANG_SUMMONING, nameLink.c_str(),""); if (needReportToTarget(target)) - ChatHandler(target).PSendSysMessage(LANG_SUMMONED_BY, nameLink.c_str()); + ChatHandler(target).PSendSysMessage(LANG_SUMMONED_BY, _player->GetName()); // stop flight if need if (target->isInFlight()) diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index ec38b3c57ac..e7a684a8111 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -66,9 +66,10 @@ bool ChatHandler::HandleMuteCommand(const char* args) return false; uint32 account_id = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid); + std::string mutereasonstr = "No reason."; char *mutereason = strtok(NULL, " "); - if(!mutereason) - strcpy(mutereason, "No reason."); + if(mutereason) + mutereason = mutereason; // find only player from same account if any if(!target) @@ -91,11 +92,11 @@ bool ChatHandler::HandleMuteCommand(const char* args) LoginDatabase.PExecute("UPDATE account SET mutetime = " UI64FMTD " WHERE id = '%u'",uint64(mutetime), account_id ); if(target) - ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime, mutereason); + ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime, mutereasonstr.c_str()); std::string nameLink = playerLink(target_name); - PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink, notspeaktime, mutereason); + PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink, notspeaktime, mutereasonstr.c_str()); return true; } diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 9a8345b67e9..7f3d173015f 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -17800,6 +17800,7 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint sLog.outDebug("CHEATING ATTEMPT slot > bagSize in BuyItemFromVendor playerGUID: "I64FMT" name: %s slot: %u", GetGUID(), GetName(), slot); return false; } + if(slot < pBag->GetBagSlot() && !pBag->GetItemByPos(slot)) bag = i; break; } diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 17ff750452a..543c56770bd 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2571,7 +2571,7 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura { // stealth must be removed at cast starting (at show channel bar) // skip triggered spell (item equip spell casting and other not explicit character casts/item uses) - if(isSpellBreakStealth(m_spellInfo) ) + if(!m_IsTriggeredSpell && isSpellBreakStealth(m_spellInfo) ) { m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CAST); for(uint32 i = 0; i < 3; ++i) |