aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Commands
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2017-02-18 13:40:03 +0100
committerjoschiwald <joschiwald.trinity@gmail.com>2017-02-18 13:40:03 +0100
commitc6632dc3ee9538c05a7086a1bd8c8ada9a3c72e4 (patch)
tree67a059723628ab25215744f39ee8b678b0081316 /src/server/scripts/Commands
parentbc3ffceae43bb81cb0f135df9a32d6f61df2f23e (diff)
Fixed build and typo
Diffstat (limited to 'src/server/scripts/Commands')
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index cd21c5335bb..a846e0056af 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -235,15 +235,11 @@ public:
char const* unknown = handler->GetTrinityString(LANG_UNKNOWN);
- std::ostringstream phases;
- for (uint32 phaseId : object->GetPhases())
- phases << phaseId << ", ";
-
handler->PSendSysMessage(LANG_MAP_POSITION,
mapId, (mapEntry ? mapEntry->MapName->Str[handler->GetSessionDbcLocale()] : unknown),
zoneId, (zoneEntry ? zoneEntry->AreaName->Str[handler->GetSessionDbcLocale()] : unknown),
areaId, (areaEntry ? areaEntry->AreaName->Str[handler->GetSessionDbcLocale()] : unknown),
- object->GetPhaseMask(), phases.str().c_str(),
+ object->GetPhaseMask(), StringJoin(object->GetPhases(), ", ").c_str(),
object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation());
if (Transport* transport = object->GetTransport())
handler->PSendSysMessage(LANG_TRANSPORT_POSITION,
@@ -1840,9 +1836,9 @@ public:
// Output XII. LANG_PINFO_CHR_ALIVE
handler->PSendSysMessage(LANG_PINFO_CHR_ALIVE, alive.c_str());
- // Output XIII. LANG_PINFO_CHR_PHASES if player is not in GM mode (GM is in every phase)
- if (target && !target->IsGameMaster() && !phases.empty())
- handler->PSendSysMessage(LANG_PINFO_CHR_PHASES, StringJoin(phases, "|").c_str());
+ // Output XIII. LANG_PINFO_CHR_PHASES
+ if (target && !phases.empty())
+ handler->PSendSysMessage(LANG_PINFO_CHR_PHASES, StringJoin(phases, ", ").c_str());
// Output XIV. LANG_PINFO_CHR_MONEY
uint32 gold = money / GOLD;