pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-13 15:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reworked valid target

Browse Source 
reworked reset portion to catch feigning as impacts faction map
This commit is contained in:
kentai 2019-10-31 11:55:07 +11:00
parent 3e50332c23
commit 316507adaf
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zone/command.cpp
View File

@ -3928,7 +3928,7 @@ void command_faction(Client *c, const Seperator *sep)
c->Message(Chat::White, "Usage: #faction Reset [id] -- Reset Targeted Players specified faction to base"); c->Message(Chat::White, "Usage: #faction Reset [id] -- Reset Targeted Players specified faction to base");
uint32 npcfac; uint32 npcfac;
std::string npcname; std::string npcname;
if (c->GetTarget()->IsNPC()) { if (c->GetTarget() && c->GetTarget()->IsNPC()) {
npcfac = c->GetTarget()->CastToNPC()->GetPrimaryFaction(); npcfac = c->GetTarget()->CastToNPC()->GetPrimaryFaction();
npcname = c->GetTarget()->CastToNPC()->GetCleanName(); npcname = c->GetTarget()->CastToNPC()->GetCleanName();
std::string blurb = fmt::format("( Target Npc: {} : has primary faction id: {} )", npcname, npcfac); std::string blurb = fmt::format("( Target Npc: {} : has primary faction id: {} )", npcname, npcfac);
@ -4005,17 +4005,32 @@ void command_faction(Client *c, const Seperator *sep)
} }
else if (strcasecmp(sep->arg[1], "reset") == 0) else if (strcasecmp(sep->arg[1], "reset") == 0)
{ {
if (!(c->GetTarget() && c->GetTarget()->IsClient())) { if (!(faction_filter == "")) {
c->Message(Chat::Red, "Player Target Required for faction reset"); if (c->GetTarget() && c->GetTarget()->IsClient())
return; {
} if (!c->CastToClient()->GetFeigned() && c->CastToClient()->GetAggroCount() == 0)
uint32 charid = c->GetTarget()->CastToClient()->CharacterID(); {
uint32 factionid = atoi(faction_filter.c_str()); uint32 charid = c->GetTarget()->CastToClient()->CharacterID();
uint32 factionid = atoi(faction_filter.c_str());
if (c->GetTarget()->CastToClient()->ReloadCharacterFaction(c->GetTarget()->CastToClient(), factionid, charid)) if (c->GetTarget()->CastToClient()->ReloadCharacterFaction(c->GetTarget()->CastToClient(), factionid, charid))
c->Message(Chat::Yellow, "faction %u was cleared.", factionid); c->Message(Chat::Yellow, "faction %u was cleared.", factionid);
else
c->Message(Chat::Red, "An error occurred clearing faction %u", factionid);
}
else
{
c->Message(Chat::Red, "Cannot be in Combat");
return;
}
}
else {
c->Message(Chat::Red, "Player Target Required (whose not feigning death)");
return;
}
}
else else
c->Message(Chat::Red, "An error occurred clearing faction %u", factionid); c->Message(Chat::Red, "No faction id entered");
} }
} }