mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 13:37:05 +00:00
[10811] Use ObjectGuids in chat commands.
Still exist 15 GUID_LOPART uses in code.
This commit is contained in:
VladimirMangos
parent
c6d3c5e0d6
commit
b305f203b9
15 changed files with 151 additions and 146 deletions
|
|
@ -111,7 +111,7 @@ bool ChatHandler::HandleNpcWhisperCommand(char* args)
|
|||
return false;
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(target, 0))
|
||||
if (HasLowerSecurity(target))
|
||||
return false;
|
||||
|
||||
pCreature->MonsterWhisper(args, target);
|
||||
|
|
@ -350,13 +350,13 @@ bool ChatHandler::HandleGPSCommand(char* args)
|
|||
bool ChatHandler::HandleNamegoCommand(char* args)
|
||||
{
|
||||
Player* target;
|
||||
uint64 target_guid;
|
||||
ObjectGuid target_guid;
|
||||
std::string target_name;
|
||||
if (!ExtractPlayerTarget(&args, &target, &target_guid, &target_name))
|
||||
return false;
|
||||
|
||||
Player* _player = m_session->GetPlayer();
|
||||
if (target == _player || target_guid == _player->GetGUID())
|
||||
if (target == _player || target_guid == _player->GetObjectGuid())
|
||||
{
|
||||
PSendSysMessage(LANG_CANT_TELEPORT_SELF);
|
||||
SetSentErrorMessage(true);
|
||||
|
|
@ -367,7 +367,7 @@ bool ChatHandler::HandleNamegoCommand(char* args)
|
|||
{
|
||||
std::string nameLink = playerLink(target_name);
|
||||
// check online security
|
||||
if (HasLowerSecurity(target, 0))
|
||||
if (HasLowerSecurity(target))
|
||||
return false;
|
||||
|
||||
if (target->IsBeingTeleported())
|
||||
|
|
@ -455,13 +455,12 @@ bool ChatHandler::HandleNamegoCommand(char* args)
|
|||
PSendSysMessage(LANG_SUMMONING, nameLink.c_str(),GetMangosString(LANG_OFFLINE));
|
||||
|
||||
// in point where GM stay
|
||||
Player::SavePositionInDB(m_session->GetPlayer()->GetMapId(),
|
||||
Player::SavePositionInDB(target_guid, m_session->GetPlayer()->GetMapId(),
|
||||
m_session->GetPlayer()->GetPositionX(),
|
||||
m_session->GetPlayer()->GetPositionY(),
|
||||
m_session->GetPlayer()->GetPositionZ(),
|
||||
m_session->GetPlayer()->GetOrientation(),
|
||||
m_session->GetPlayer()->GetZoneId(),
|
||||
target_guid);
|
||||
m_session->GetPlayer()->GetZoneId());
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
@ -471,13 +470,13 @@ bool ChatHandler::HandleNamegoCommand(char* args)
|
|||
bool ChatHandler::HandleGonameCommand(char* args)
|
||||
{
|
||||
Player* target;
|
||||
uint64 target_guid;
|
||||
ObjectGuid target_guid;
|
||||
std::string target_name;
|
||||
if (!ExtractPlayerTarget(&args, &target, &target_guid, &target_name))
|
||||
return false;
|
||||
|
||||
Player* _player = m_session->GetPlayer();
|
||||
if (target == _player || target_guid == _player->GetGUID())
|
||||
if (target == _player || target_guid == _player->GetObjectGuid())
|
||||
{
|
||||
SendSysMessage(LANG_CANT_TELEPORT_SELF);
|
||||
SetSentErrorMessage(true);
|
||||
|
|
@ -488,7 +487,7 @@ bool ChatHandler::HandleGonameCommand(char* args)
|
|||
if (target)
|
||||
{
|
||||
// check online security
|
||||
if (HasLowerSecurity(target, 0))
|
||||
if (HasLowerSecurity(target))
|
||||
return false;
|
||||
|
||||
std::string chrNameLink = playerLink(target_name);
|
||||
|
|
@ -605,7 +604,7 @@ bool ChatHandler::HandleGonameCommand(char* args)
|
|||
float x,y,z,o;
|
||||
uint32 map;
|
||||
bool in_flight;
|
||||
if (!Player::LoadPositionFromDB(map,x,y,z,o,in_flight,target_guid))
|
||||
if (!Player::LoadPositionFromDB(target_guid, map,x,y,z,o,in_flight))
|
||||
return false;
|
||||
|
||||
return HandleGoHelper(_player, map, x, y, &z);
|
||||
|
|
@ -622,7 +621,7 @@ bool ChatHandler::HandleRecallCommand(char* args)
|
|||
return false;
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(target, 0))
|
||||
if (HasLowerSecurity(target))
|
||||
return false;
|
||||
|
||||
if (target->IsBeingTeleported())
|
||||
|
|
@ -660,7 +659,7 @@ bool ChatHandler::HandleModifyHPCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
PSendSysMessage(LANG_YOU_CHANGE_HP, GetNameLink(chr).c_str(), hp, hpm);
|
||||
|
|
@ -698,7 +697,7 @@ bool ChatHandler::HandleModifyManaCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
PSendSysMessage(LANG_YOU_CHANGE_MANA, GetNameLink(chr).c_str(), mana, manam);
|
||||
|
|
@ -736,7 +735,7 @@ bool ChatHandler::HandleModifyEnergyCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
PSendSysMessage(LANG_YOU_CHANGE_ENERGY, GetNameLink(chr).c_str(), energy/10, energym/10);
|
||||
|
|
@ -776,7 +775,7 @@ bool ChatHandler::HandleModifyRageCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
PSendSysMessage(LANG_YOU_CHANGE_RAGE, GetNameLink(chr).c_str(), rage/10, ragem/10);
|
||||
|
|
@ -908,7 +907,7 @@ bool ChatHandler::HandleModifyTalentCommand (char* args)
|
|||
if(target->GetTypeId()==TYPEID_PLAYER)
|
||||
{
|
||||
// check online security
|
||||
if (HasLowerSecurity((Player*)target, 0))
|
||||
if (HasLowerSecurity((Player*)target))
|
||||
return false;
|
||||
|
||||
((Player*)target)->SetFreeTalentPoints(tp);
|
||||
|
|
@ -921,7 +920,7 @@ bool ChatHandler::HandleModifyTalentCommand (char* args)
|
|||
if(owner && owner->GetTypeId() == TYPEID_PLAYER && ((Pet *)target)->IsPermanentPetFor((Player*)owner))
|
||||
{
|
||||
// check online security
|
||||
if (HasLowerSecurity((Player*)owner, 0))
|
||||
if (HasLowerSecurity((Player*)owner))
|
||||
return false;
|
||||
|
||||
((Pet *)target)->SetFreeTalentPoints(tp);
|
||||
|
|
@ -950,7 +949,7 @@ bool ChatHandler::HandleTaxiCheatCommand(char* args)
|
|||
if (!chr)
|
||||
chr=m_session->GetPlayer();
|
||||
// check online security
|
||||
else if (HasLowerSecurity(chr, 0))
|
||||
else if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
if (value)
|
||||
|
|
@ -995,7 +994,7 @@ bool ChatHandler::HandleModifyASpeedCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
std::string chrNameLink = GetNameLink(chr);
|
||||
|
|
@ -1043,7 +1042,7 @@ bool ChatHandler::HandleModifySpeedCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
std::string chrNameLink = GetNameLink(chr);
|
||||
|
|
@ -1088,7 +1087,7 @@ bool ChatHandler::HandleModifySwimCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
std::string chrNameLink = GetNameLink(chr);
|
||||
|
|
@ -1133,7 +1132,7 @@ bool ChatHandler::HandleModifyBWalkCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
std::string chrNameLink = GetNameLink(chr);
|
||||
|
|
@ -1178,7 +1177,7 @@ bool ChatHandler::HandleModifyFlyCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
PSendSysMessage(LANG_YOU_CHANGE_FLY_SPEED, modSpeed, GetNameLink(chr).c_str());
|
||||
|
|
@ -1215,7 +1214,7 @@ bool ChatHandler::HandleModifyScaleCommand(char* args)
|
|||
if (target->GetTypeId()==TYPEID_PLAYER)
|
||||
{
|
||||
// check online security
|
||||
if (HasLowerSecurity((Player*)target, 0))
|
||||
if (HasLowerSecurity((Player*)target))
|
||||
return false;
|
||||
|
||||
PSendSysMessage(LANG_YOU_CHANGE_SIZE, Scale, GetNameLink((Player*)target).c_str());
|
||||
|
|
@ -1461,7 +1460,7 @@ bool ChatHandler::HandleModifyMountCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
PSendSysMessage(LANG_YOU_GIVE_MOUNT, GetNameLink(chr).c_str());
|
||||
|
|
@ -1502,7 +1501,7 @@ bool ChatHandler::HandleModifyMoneyCommand(char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(chr, 0))
|
||||
if (HasLowerSecurity(chr))
|
||||
return false;
|
||||
|
||||
int32 addmoney = atoi(args);
|
||||
|
|
@ -1564,7 +1563,7 @@ bool ChatHandler::HandleModifyHonorCommand (char* args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(target, 0))
|
||||
if (HasLowerSecurity(target))
|
||||
return false;
|
||||
|
||||
int32 amount = (int32)atoi(args);
|
||||
|
|
@ -1751,7 +1750,7 @@ bool ChatHandler::HandleSendMailCommand(char* args)
|
|||
{
|
||||
// format: name "subject text" "mail text"
|
||||
Player* target;
|
||||
uint64 target_guid;
|
||||
ObjectGuid target_guid;
|
||||
std::string target_name;
|
||||
if (!ExtractPlayerTarget(&args, &target, &target_guid, &target_name))
|
||||
return false;
|
||||
|
|
@ -1785,7 +1784,7 @@ bool ChatHandler::HandleTeleNameCommand(char* args)
|
|||
char* nameStr = ExtractOptNotLastArg(&args);
|
||||
|
||||
Player* target;
|
||||
uint64 target_guid;
|
||||
ObjectGuid target_guid;
|
||||
std::string target_name;
|
||||
if (!ExtractPlayerTarget(&nameStr, &target, &target_guid, &target_name))
|
||||
return false;
|
||||
|
|
@ -1802,7 +1801,7 @@ bool ChatHandler::HandleTeleNameCommand(char* args)
|
|||
if (target)
|
||||
{
|
||||
// check online security
|
||||
if (HasLowerSecurity(target, 0))
|
||||
if (HasLowerSecurity(target))
|
||||
return false;
|
||||
|
||||
std::string chrNameLink = playerLink(target_name);
|
||||
|
|
@ -1829,8 +1828,9 @@ bool ChatHandler::HandleTeleNameCommand(char* args)
|
|||
std::string nameLink = playerLink(target_name);
|
||||
|
||||
PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), GetMangosString(LANG_OFFLINE), tele->name.c_str());
|
||||
Player::SavePositionInDB(tele->mapId,tele->position_x,tele->position_y,tele->position_z,tele->orientation,
|
||||
sTerrainMgr.GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z),target_guid);
|
||||
Player::SavePositionInDB(target_guid, tele->mapId,
|
||||
tele->position_x, tele->position_y, tele->position_z, tele->orientation,
|
||||
sTerrainMgr.GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z));
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
@ -1851,7 +1851,7 @@ bool ChatHandler::HandleTeleGroupCommand(char * args)
|
|||
}
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(player, 0))
|
||||
if (HasLowerSecurity(player))
|
||||
return false;
|
||||
|
||||
// id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
|
||||
|
|
@ -1881,7 +1881,7 @@ bool ChatHandler::HandleTeleGroupCommand(char * args)
|
|||
continue;
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(pl, 0))
|
||||
if (HasLowerSecurity(pl))
|
||||
return false;
|
||||
|
||||
std::string plNameLink = GetNameLink(pl);
|
||||
|
|
@ -1920,7 +1920,7 @@ bool ChatHandler::HandleGroupgoCommand(char* args)
|
|||
return false;
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(target, 0))
|
||||
if (HasLowerSecurity(target))
|
||||
return false;
|
||||
|
||||
Group *grp = target->GetGroup();
|
||||
|
|
@ -1956,7 +1956,7 @@ bool ChatHandler::HandleGroupgoCommand(char* args)
|
|||
continue;
|
||||
|
||||
// check online security
|
||||
if (HasLowerSecurity(pl, 0))
|
||||
if (HasLowerSecurity(pl))
|
||||
return false;
|
||||
|
||||
std::string plNameLink = GetNameLink(pl);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue