josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Tickets: Fixed retrieving name of assigned GM

Browse Source
This commit is contained in:
Shauren
2011-05-11 14:18:09 +02:00
parent 696215c7c5
commit 7a3e622da9
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Chat/Commands/TicketCommands.cpp
+2 -2
View File
@@ -242,7 +242,7 @@ bool ChatHandler::HandleGMTicketUnAssignCommand(const char* args)
ticket->SaveToDB(trans);
sTicketMgr->UpdateLastChange();
std::string msg = ticket->FormatMessageString(*this, NULL, ticket->GetAssignedToName(), player->GetName(), NULL);
std::string msg = ticket->FormatMessageString(*this, NULL, ticket->GetAssignedToName().c_str(), player->GetName(), NULL);
SendGlobalGMSysMessage(msg.c_str());
return true;
}
@@ -278,7 +278,7 @@ bool ChatHandler::HandleGMTicketCommentCommand(const char* args)
ticket->SaveToDB(trans);
sTicketMgr->UpdateLastChange();
std::string msg = ticket->FormatMessageString(*this, NULL, ticket->GetAssignedToName(), NULL, NULL);
std::string msg = ticket->FormatMessageString(*this, NULL, ticket->GetAssignedToName().c_str(), NULL, NULL);
msg += PGetParseString(LANG_COMMAND_TICKETLISTADDCOMMENT, player->GetName(), comment);
SendGlobalGMSysMessage(msg.c_str());
src/server/game/Entities/Unit/Unit.cpp
+3 -3
View File
@@ -15638,11 +15638,11 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const * a
// Pets already have a properly initialized CharmInfo, don't overwrite it.
if (type != CHARM_TYPE_VEHICLE && !GetCharmInfo())
{
CharmInfo *charmInfo = InitCharmInfo();
InitCharmInfo();
if (type == CHARM_TYPE_POSSESS)
charmInfo->InitPossessCreateSpells();
GetCharmInfo()->InitPossessCreateSpells();
else
charmInfo->InitCharmCreateSpells();
GetCharmInfo()->InitCharmCreateSpells();
}
if (charmer->GetTypeId() == TYPEID_PLAYER)
src/server/game/Tickets/TicketMgr.h
+3 -3
View File
@@ -84,7 +84,7 @@ public:
bool IsClosed() const { return _closedBy; }
bool IsCompleted() const { return _completed; }
bool IsFromPlayer(const uint64& guid) { return guid == _playerGuid; }
bool IsFromPlayer(const uint64& guid) const { return guid == _playerGuid; }
bool IsAssigned() const { return _assignedTo != 0; }
bool IsAssignedTo(const uint64& guid) const { return guid == _assignedTo; }
bool IsAssignedNotTo(const uint64& guid) const { return IsAssigned() && !IsAssignedTo(guid); }
@@ -95,12 +95,12 @@ public:
std::string GetMessage() const { return _message; }
Player* GetAssignedPlayer() const { return sObjectMgr->GetPlayer(_assignedTo); }
const uint64& GetAssignedToGUID() const { return _assignedTo; }
const char* GetAssignedToName() const
std::string GetAssignedToName() const
{
std::string name;
if (_assignedTo)
if (sObjectMgr->GetPlayerNameByGUID(_assignedTo, name))
return name.c_str();
return name;
return NULL;
}
const uint64& GetLastModifiedTime() const { return _lastModifiedTime; }
src/server/game/World/World.h
+3 -3
View File
@@ -685,8 +685,8 @@ class World
void LoadWorldStates();
/// Are we on a "Player versus Player" server?
bool IsPvPRealm() { return (getIntConfig(CONFIG_GAME_TYPE) == REALM_TYPE_PVP || getIntConfig(CONFIG_GAME_TYPE) == REALM_TYPE_RPPVP || getIntConfig(CONFIG_GAME_TYPE) == REALM_TYPE_FFA_PVP); }
bool IsFFAPvPRealm() { return getIntConfig(CONFIG_GAME_TYPE) == REALM_TYPE_FFA_PVP; }
bool IsPvPRealm() const { return (getIntConfig(CONFIG_GAME_TYPE) == REALM_TYPE_PVP || getIntConfig(CONFIG_GAME_TYPE) == REALM_TYPE_RPPVP || getIntConfig(CONFIG_GAME_TYPE) == REALM_TYPE_FFA_PVP); }
bool IsFFAPvPRealm() const { return getIntConfig(CONFIG_GAME_TYPE) == REALM_TYPE_FFA_PVP; }
void KickAll();
void KickAllLess(AccountTypes sec);
@@ -730,7 +730,7 @@ class World
bool isEventKillStart;
uint32 GetCleaningFlags() { return m_CleaningFlags; }
uint32 GetCleaningFlags() const { return m_CleaningFlags; }
void SetCleaningFlags(uint32 flags) { m_CleaningFlags = flags; }
protected:
void _UpdateGameTime();