pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up last name handling in NPC::PetOnSpawn

Browse Source 
Same as last time
This commit is contained in:
Michael Cook (mackal) 2021-03-05 15:51:59 -05:00
parent f7d40ec88e
commit 0b8220be32
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zone/npc.cpp
View File

@ -2254,8 +2254,12 @@ void NPC::PetOnSpawn(NewSpawn_Struct* ns)
if (RuleB(Pets, UnTargetableSwarmPet)) if (RuleB(Pets, UnTargetableSwarmPet))
{ {
ns->spawn.bodytype = 11; ns->spawn.bodytype = 11;
if(!IsCharmed() && swarmOwner->IsClient()) if(!IsCharmed() && swarmOwner->IsClient()) {
sprintf(ns->spawn.lastName, "%s's Pet", swarmOwner->GetName()); std::string tmp_lastname = swarmOwner->GetName();
tmp_lastname += "'s Pet";
if (tmp_lastname.size() < sizeof(ns->spawn.lastName))
strn0cpy(ns->spawn.lastName, tmp_lastname.c_str(), sizeof(ns->spawn.lastName));
}
} }
} }
else if(GetOwnerID()) else if(GetOwnerID())
@ -2267,7 +2271,10 @@ void NPC::PetOnSpawn(NewSpawn_Struct* ns)
if(client) if(client)
{ {
SetPetOwnerClient(true); SetPetOwnerClient(true);
sprintf(ns->spawn.lastName, "%s's Pet", client->GetName()); std::string tmp_lastname = swarmOwner->GetName();
tmp_lastname += "'s Pet";
if (tmp_lastname.size() < sizeof(ns->spawn.lastName))
strn0cpy(ns->spawn.lastName, tmp_lastname.c_str(), sizeof(ns->spawn.lastName));
} }
} }
} }