Skip to content

Commit bc7be2a

Browse files
ShaurenShauren
committed
Core/Entities: Removed Object::GetGUIDLow()
(cherry picked from commit a97bd33)
1 parent 5f6974c commit bc7be2a

5 files changed

Lines changed: 20 additions & 10 deletions

File tree

‎sql/updates/world/3.3.5/2025_09_29_01_world_2014_10_23_00_world.sql‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
UPDATE `trinity_string` SET `content_default`='NPC currently selected by player:\nName: %s\nSpawnID: %u.\nGUID: %s.\nEntry: %u.\nFaction: %u.\nNPC Flags: %u.\nDisplayID: %u (Native: %u).' WHERE `entry`=539;
2+
UPDATE `trinity_string` SET `content_default`='%s, faction is %i, flags is %i, npcflag is %i, dynflag flag is %i.' WHERE `entry`=128;
3+
UPDATE `trinity_string` SET `content_default`='You changed %s Faction to %i, flags to %i, npcflag to %i, dynflag to %i.' WHERE `entry`=130;
4+
UPDATE `trinity_string` SET `content_default`='%s (%s) movement generators stack:' WHERE `entry`=526;
5+
UPDATE `trinity_string` SET `content_default`=' Targeted to player %s (%s)' WHERE `entry`=532;
6+
UPDATE `trinity_string` SET `content_default`=' Targeted to creature %s (%s)' WHERE `entry`=533;
7+
UPDATE `trinity_string` SET `content_default`=' Follow player %s (%s)' WHERE `entry`=1139;
8+
UPDATE `trinity_string` SET `content_default`=' Follow creature %s (%s)' WHERE `entry`=1140;
9+
UPDATE `trinity_string` SET `content_default`='%s updateIndex: %i, value: %i.' WHERE `entry`=562;
10+
UPDATE `trinity_string` SET `content_default`='You change %s UpdateIndex: %i value to %i.' WHERE `entry`=563;

‎src/server/scripts/Commands/cs_debug.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,13 +1251,13 @@ class debug_commandscript : public CommandScript
12511251
{
12521252
value = unit->GetUInt32Value(index);
12531253

1254-
handler->PSendSysMessage(LANG_UPDATE, unit->GetGUID().GetCounter(), index, *value);
1254+
handler->PSendSysMessage(LANG_UPDATE, unit->GetGUID().ToString().c_str(), index, *value);
12551255
return true;
12561256
}
12571257

12581258
unit->SetUInt32Value(index, *value);
12591259

1260-
handler->PSendSysMessage(LANG_UPDATE_CHANGE, unit->GetGUID().GetCounter(), index, *value);
1260+
handler->PSendSysMessage(LANG_UPDATE_CHANGE, unit->GetGUID().ToString().c_str(), index, *value);
12611261
return true;
12621262
}
12631263

‎src/server/scripts/Commands/cs_misc.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2174,7 +2174,7 @@ class misc_commandscript : public CommandScript
21742174
return false;
21752175
}
21762176

2177-
handler->PSendSysMessage(LANG_MOVEGENS_LIST, (unit->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), unit->GetGUID().GetCounter());
2177+
handler->PSendSysMessage(LANG_MOVEGENS_LIST, (unit->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), unit->GetGUID().ToString().c_str());
21782178

21792179
if (unit->GetMotionMaster()->Empty())
21802180
{
@@ -2206,17 +2206,17 @@ class misc_commandscript : public CommandScript
22062206
if (info.TargetGUID.IsEmpty())
22072207
handler->SendSysMessage(LANG_MOVEGENS_CHASE_NULL);
22082208
else if (info.TargetGUID.IsPlayer())
2209-
handler->PSendSysMessage(LANG_MOVEGENS_CHASE_PLAYER, info.TargetName.c_str(), info.TargetGUID.GetCounter());
2209+
handler->PSendSysMessage(LANG_MOVEGENS_CHASE_PLAYER, info.TargetName.c_str(), info.TargetGUID.ToString().c_str());
22102210
else
2211-
handler->PSendSysMessage(LANG_MOVEGENS_CHASE_CREATURE, info.TargetName.c_str(), info.TargetGUID.GetCounter());
2211+
handler->PSendSysMessage(LANG_MOVEGENS_CHASE_CREATURE, info.TargetName.c_str(), info.TargetGUID.ToString().c_str());
22122212
break;
22132213
case FOLLOW_MOTION_TYPE:
22142214
if (info.TargetGUID.IsEmpty())
22152215
handler->SendSysMessage(LANG_MOVEGENS_FOLLOW_NULL);
22162216
else if (info.TargetGUID.IsPlayer())
2217-
handler->PSendSysMessage(LANG_MOVEGENS_FOLLOW_PLAYER, info.TargetName.c_str(), info.TargetGUID.GetCounter());
2217+
handler->PSendSysMessage(LANG_MOVEGENS_FOLLOW_PLAYER, info.TargetName.c_str(), info.TargetGUID.ToString().c_str());
22182218
else
2219-
handler->PSendSysMessage(LANG_MOVEGENS_FOLLOW_CREATURE, info.TargetName.c_str(), info.TargetGUID.GetCounter());
2219+
handler->PSendSysMessage(LANG_MOVEGENS_FOLLOW_CREATURE, info.TargetName.c_str(), info.TargetGUID.ToString().c_str());
22202220
break;
22212221
case HOME_MOTION_TYPE:
22222222
if (unit->GetTypeId() == TYPEID_UNIT)

‎src/server/scripts/Commands/cs_modify.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class modify_commandscript : public CommandScript
228228

229229
if (!factionid)
230230
{
231-
handler->PSendSysMessage(LANG_CURRENT_FACTION, target->GetGUID().GetCounter(), *factionid, *flag, *npcflag, *dyflag);
231+
handler->PSendSysMessage(LANG_CURRENT_FACTION, target->GetGUID().ToString().c_str(), *factionid, *flag, *npcflag, *dyflag);
232232
return true;
233233
}
234234

@@ -239,7 +239,7 @@ class modify_commandscript : public CommandScript
239239
return false;
240240
}
241241

242-
handler->PSendSysMessage(LANG_YOU_CHANGE_FACTION, target->GetGUID().GetCounter(), *factionid, *flag, *npcflag, *dyflag);
242+
handler->PSendSysMessage(LANG_YOU_CHANGE_FACTION, target->GetGUID().ToString().c_str(), *factionid, *flag, *npcflag, *dyflag);
243243

244244
target->SetFaction(*factionid);
245245
target->ReplaceAllUnitFlags(UnitFlags(*flag));

‎src/server/scripts/Commands/cs_npc.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ class npc_commandscript : public CommandScript
482482
std::string curRespawnDelayStr = secsToTimeString(uint64(curRespawnDelay), TimeFormat::ShortText);
483483
std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(), TimeFormat::ShortText);
484484

485-
handler->PSendSysMessage(LANG_NPCINFO_CHAR, target->GetName().c_str(), target->GetSpawnId(), target->GetGUID().GetCounter(), entry, faction, npcflags, displayid, nativeid);
485+
handler->PSendSysMessage(LANG_NPCINFO_CHAR, target->GetName().c_str(), target->GetSpawnId(), target->GetGUID().ToString().c_str(), entry, faction, npcflags, displayid, nativeid);
486486
if (target->GetCreatureData() && target->GetCreatureData()->spawnGroupData->groupId)
487487
{
488488
SpawnGroupTemplateData const* const groupData = target->GetCreatureData()->spawnGroupData;

0 commit comments

Comments
 (0)