Merge branch '3.3.5' into 4.3.4
Conflicts: sql/base/auth_database.sql sql/updates/world/2015_08_29_00_world.sql sql/updates/world/2015_08_29_01_world.sql sql/updates/world/2015_08_30_00_world.sql sql/updates/world/2015_08_31_01_world.sql sql/updates/world/2015_09_02_00_world.sql sql/updates/world/2015_09_02_01_world.sql sql/updates/world/2015_09_02_04_world.sql sql/updates/world/2015_09_03_00_world.sql sql/updates/world/2015_09_03_01_world.sql sql/updates/world/2015_09_03_02_world.sql sql/updates/world/2015_09_03_03_world.sql sql/updates/world/2015_09_03_04_world.sql sql/updates/world/2015_09_03_06_world.sql sql/updates/world/2015_09_03_07_world.sql sql/updates/world/2015_09_03_08_world.sql sql/updates/world/2015_09_03_09_world.sql sql/updates/world/2015_09_03_10_world.sql sql/updates/world/2015_09_03_11_world.sql sql/updates/world/2015_09_04_00_world.sql sql/updates/world/2015_09_04_01_world.sql sql/updates/world/2015_09_04_02_world.sql sql/updates/world/2015_09_04_03_world.sql sql/updates/world/2015_09_07_00_world.sql sql/updates/world/2015_09_07_01_world.sql sql/updates/world/2015_09_07_02_world.sql sql/updates/world/2015_09_07_03_world.sql sql/updates/world/2015_09_07_04_world.sql sql/updates/world/2015_09_07_05_world.sql sql/updates/world/2015_09_08_00_world.sql src/common/Collision/Management/MMapManager.cpp src/common/Cryptography/Authentication/AuthCrypt.cpp src/common/Cryptography/Authentication/AuthCrypt.h src/common/Cryptography/HMACSHA1.cpp src/common/Cryptography/HMACSHA1.h src/server/CMakeLists.txt src/server/collision/CMakeLists.txt src/server/game/CMakeLists.txt src/server/game/Entities/Object/ObjectGuid.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Quests/QuestDef.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/World/World.cpp src/server/scripts/CMakeLists.txt src/server/scripts/Commands/cs_cheat.cpp src/server/scripts/Commands/cs_debug.cpp src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp src/server/scripts/Spells/spell_mage.cpp src/server/worldserver/CMakeLists.txt src/server/worldserver/Main.cpp
This commit is contained in:
commit
221f1405b6
252 files changed
+5466
-5950
No files matched your search
@@ -24,7 +24,6 @@ EndScriptData */
|
||||
|
||||
#include "Chat.h"
|
||||
#include "Language.h"
|
||||
#include "ObjectMgr.h"
|
||||
#include "Player.h"
|
||||
#include "ScriptMgr.h"
|
||||
|
||||
@@ -166,8 +165,8 @@ public:
|
||||
{
|
||||
Player* player = handler->GetSession()->GetPlayer();
|
||||
|
||||
const char* enabled = "enabled";
|
||||
const char* disabled = "disabled";
|
||||
const char* enabled = "ON";
|
||||
const char* disabled = "OFF";
|
||||
|
||||
handler->SendSysMessage(LANG_COMMAND_CHEAT_STATUS);
|
||||
handler->PSendSysMessage(LANG_COMMAND_CHEAT_GOD, player->GetCommandStatus(CHEAT_GOD) ? enabled : disabled);
|
||||
@@ -175,6 +174,8 @@ public:
|
||||
handler->PSendSysMessage(LANG_COMMAND_CHEAT_CT, player->GetCommandStatus(CHEAT_CASTTIME) ? enabled : disabled);
|
||||
handler->PSendSysMessage(LANG_COMMAND_CHEAT_POWER, player->GetCommandStatus(CHEAT_POWER) ? enabled : disabled);
|
||||
handler->PSendSysMessage(LANG_COMMAND_CHEAT_WW, player->GetCommandStatus(CHEAT_WATERWALK) ? enabled : disabled);
|
||||
handler->PSendSysMessage(LANG_COMMAND_CHEAT_TAXINODES, player->isTaxiCheater() ? enabled : disabled);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -187,13 +188,7 @@ public:
|
||||
|
||||
Player* target = handler->GetSession()->GetPlayer();
|
||||
if (!*args)
|
||||
{
|
||||
argstr = (target->GetCommandStatus(CHEAT_WATERWALK)) ? "off" : "on";
|
||||
if (target->GetCommandStatus(CHEAT_WATERWALK))
|
||||
argstr = "off";
|
||||
else
|
||||
argstr = "on";
|
||||
}
|
||||
|
||||
if (argstr == "off")
|
||||
{
|
||||
@@ -215,15 +210,7 @@ public:
|
||||
|
||||
static bool HandleTaxiCheatCommand(ChatHandler* handler, const char* args)
|
||||
{
|
||||
if (!*args)
|
||||
{
|
||||
handler->SendSysMessage(LANG_USE_BOL);
|
||||
handler->SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string argstr = (char*)args;
|
||||
|
||||
Player* chr = handler->getSelectedPlayer();
|
||||
|
||||
if (!chr)
|
||||
@@ -231,13 +218,9 @@ public:
|
||||
else if (handler->HasLowerSecurity(chr, ObjectGuid::Empty)) // check online security
|
||||
return false;
|
||||
|
||||
if (argstr == "on")
|
||||
if (!*args)
|
||||
{
|
||||
chr->SetTaxiCheater(true);
|
||||
handler->PSendSysMessage(LANG_YOU_GIVE_TAXIS, handler->GetNameLink(chr).c_str());
|
||||
if (handler->needReportToTarget(chr))
|
||||
ChatHandler(chr->GetSession()).PSendSysMessage(LANG_YOURS_TAXIS_ADDED, handler->GetNameLink().c_str());
|
||||
return true;
|
||||
argstr = (chr->isTaxiCheater()) ? "off" : "on";
|
||||
}
|
||||
|
||||
if (argstr == "off")
|
||||
@@ -246,7 +229,14 @@ public:
|
||||
handler->PSendSysMessage(LANG_YOU_REMOVE_TAXIS, handler->GetNameLink(chr).c_str());
|
||||
if (handler->needReportToTarget(chr))
|
||||
ChatHandler(chr->GetSession()).PSendSysMessage(LANG_YOURS_TAXIS_REMOVED, handler->GetNameLink().c_str());
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (argstr == "on")
|
||||
{
|
||||
chr->SetTaxiCheater(true);
|
||||
handler->PSendSysMessage(LANG_YOU_GIVE_TAXIS, handler->GetNameLink(chr).c_str());
|
||||
if (handler->needReportToTarget(chr))
|
||||
ChatHandler(chr->GetSession()).PSendSysMessage(LANG_YOURS_TAXIS_ADDED, handler->GetNameLink().c_str());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -260,10 +250,11 @@ public:
|
||||
if (!*args)
|
||||
return false;
|
||||
|
||||
// std::int flag = (char*)args;
|
||||
int flag = atoi((char*)args);
|
||||
|
||||
Player* chr = handler->getSelectedPlayer();
|
||||
if (chr == NULL)
|
||||
if (!chr)
|
||||
{
|
||||
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
|
||||
handler->SetSentErrorMessage(true);
|
||||
|
||||
Reference in new issue
Block a user