aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Commands
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/scripts/Commands')
-rw-r--r--src/server/scripts/Commands/cs_character.cpp4
-rw-r--r--src/server/scripts/Commands/cs_debug.cpp8
-rw-r--r--src/server/scripts/Commands/cs_gobject.cpp2
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp8
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp2
-rw-r--r--src/server/scripts/Commands/cs_pet.cpp2
-rw-r--r--src/server/scripts/Commands/cs_reset.cpp2
7 files changed, 14 insertions, 14 deletions
diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp
index c8961d4fad8..ed211673917 100644
--- a/src/server/scripts/Commands/cs_character.cpp
+++ b/src/server/scripts/Commands/cs_character.cpp
@@ -211,7 +211,7 @@ public:
return;
}
- if (sObjectMgr->GetPlayerGUIDByName(delInfo.name))
+ if (!sObjectMgr->GetPlayerGUIDByName(delInfo.name).IsEmpty())
{
handler->PSendSysMessage(LANG_CHARACTER_DELETED_SKIP_NAME, delInfo.name.c_str(), delInfo.guid.GetCounter(), delInfo.accountId);
return;
@@ -990,7 +990,7 @@ public:
return false;
}
- switch (PlayerDumpWriter().WriteDump(fileStr, uint32(guid)))
+ switch (PlayerDumpWriter().WriteDump(fileStr, uint32(guid.GetCounter())))
{
case DUMP_SUCCESS:
handler->PSendSysMessage(LANG_COMMAND_EXPORT_SUCCESS);
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 862b683597a..b9207444f82 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -182,7 +182,7 @@ public:
return false;
}
- if (handler->GetSession()->GetPlayer()->GetTarget())
+ if (!handler->GetSession()->GetPlayer()->GetTarget().IsEmpty())
unit->PlayDistanceSound(soundId, handler->GetSession()->GetPlayer());
else
unit->PlayDirectSound(soundId, handler->GetSession()->GetPlayer());
@@ -390,15 +390,15 @@ public:
ifs.close();
return false;
}
- data << uint64(obj->GetGUID());
+ data << obj->GetGUID();
}
else if (type == "myguid")
{
- data << uint64(player->GetGUID());
+ data << player->GetGUID();
}
else if (type == "itsguid")
{
- data << uint64(unit->GetGUID());
+ data << unit->GetGUID();
}
else if (type == "itspos")
{
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index c8168a1391a..f1c955f4b69 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -371,7 +371,7 @@ public:
}
ObjectGuid ownerGuid = object->GetOwnerGUID();
- if (ownerGuid)
+ if (!ownerGuid.IsEmpty())
{
Unit* owner = ObjectAccessor::GetUnit(*handler->GetSession()->GetPlayer(), ownerGuid);
if (!owner || !ownerGuid.IsPlayer())
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 055f0aa8914..9b156612eae 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -138,7 +138,7 @@ public:
if (*args)
{
ObjectGuid guid = handler->extractGuidFromLink((char*)args);
- if (guid)
+ if (!guid.IsEmpty())
object = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*handler->GetSession()->GetPlayer(), guid, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT);
if (!object)
@@ -709,7 +709,7 @@ public:
if (*args)
{
ObjectGuid guid = handler->extractGuidFromLink((char*)args);
- if (guid)
+ if (!guid.IsEmpty())
obj = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*handler->GetSession()->GetPlayer(), guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT);
if (!obj)
@@ -1766,7 +1766,7 @@ public:
Player* player = handler->GetSession()->GetPlayer();
// accept only explicitly selected target (not implicitly self targeting case)
- Creature* target = player->GetTarget() ? handler->getSelectedCreature() : nullptr;
+ Creature* target = !player->GetTarget().IsEmpty() ? handler->getSelectedCreature() : nullptr;
if (target)
{
if (target->IsPet())
@@ -2519,7 +2519,7 @@ public:
WorldPacket data(SMSG_PLAY_SOUND, 4 + 8);
data << uint32(soundId);
- data << uint64(handler->GetSession()->GetPlayer()->GetGUID());
+ data << handler->GetSession()->GetPlayer()->GetGUID();
sWorld->SendGlobalMessage(&data);
handler->PSendSysMessage(LANG_COMMAND_PLAYED_TO_ALL, soundId);
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 85bc6db46f5..0bfcc1b823f 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -1396,7 +1396,7 @@ public:
Player* player = handler->GetSession()->GetPlayer();
- if (player->GetPetGUID())
+ if (!player->GetPetGUID().IsEmpty())
{
handler->SendSysMessage (LANG_YOU_ALREADY_HAVE_PET);
handler->SetSentErrorMessage (true);
diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp
index bb5e0764f2f..d36214d1898 100644
--- a/src/server/scripts/Commands/cs_pet.cpp
+++ b/src/server/scripts/Commands/cs_pet.cpp
@@ -65,7 +65,7 @@ public:
return false;
}
- if (player->GetPetGUID())
+ if (!player->GetPetGUID().IsEmpty())
{
handler->PSendSysMessage("You already have a pet");
handler->SetSentErrorMessage(true);
diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp
index 2823c2c8c5d..1b2fc2c0509 100644
--- a/src/server/scripts/Commands/cs_reset.cpp
+++ b/src/server/scripts/Commands/cs_reset.cpp
@@ -242,7 +242,7 @@ public:
target->SendTalentsInfoData(true);
return true;
}
- else if (targetGuid)
+ else if (!targetGuid.IsEmpty())
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ADD_AT_LOGIN_FLAG);
stmt->setUInt16(0, uint16(AT_LOGIN_NONE | AT_LOGIN_RESET_PET_TALENTS));