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

[Commands] Adjust #kill and #list Commands (#4271)

Browse Source 
* [Commands] Adjust #kill/#list Commands

* Update list.cpp
This commit is contained in:
Alex King
2024-05-04 18:49:18 -04:00
committed by GitHub
parent c4cda66c3b
commit 943274b443
2 changed files with 115 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/gm_commands/kill.cpp
+24 -11
View File
@@ -2,27 +2,40 @@
void command_kill(Client *c, const Seperator *sep)
{
auto target = c->GetTarget();
if (!target) {
c->Message(Chat::White, "You must have a target to use this command.");
if (!sep->IsNumber(1) && !c->GetTarget()) {
c->Message(Chat::White, "#kill - Kills your target");
c->Message(Chat::White, "#kill [entity_id] - Kills the entity ID you provided");
return;
}
if (
!target->IsClient() ||
target->CastToClient()->Admin() <= c->Admin()
) {
if (c != target) {
Mob* t = nullptr;
uint16 entity_id = 0;
if (sep->IsNumber(1)) {
entity_id = static_cast<uint16>(Strings::ToUnsignedInt(sep->arg[1]));
t = entity_list.GetMob(entity_id);
} else {
t = c->GetTarget();
}
if (!t) {
c->Message(Chat::White, "You must have a target or supply an entity ID to use this command.");
return;
}
if (!t->IsClient() || t->CastToClient()->Admin() <= c->Admin()) {
if (c != t) {
c->Message(
Chat::White,
fmt::format(
"Killing {}.",
c->GetTargetDescription(target)
"Killing {}{}.",
c->GetTargetDescription(t),
entity_id ? " by entity id" : ""
).c_str()
);
}
target->Kill();
t->Kill();
}
}