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

Merge branches 'lsid' and 'master' of https://github.com/EQEmu/Server into lsid

Browse Source
This commit is contained in:
Akkadius
2019-08-10 03:26:40 -05:00
parent d2e7cf96bd 24d2a5723b
commit eaf31fb14b
46 changed files with 1857 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/command.cpp
+4 -4
View File
@@ -1912,7 +1912,7 @@ void command_permaclass(Client *c, const Seperator *sep)
Log(Logs::General, Logs::Normal, "Class change request from %s for %s, requested class:%i", c->GetName(), t->GetName(), atoi(sep->arg[1]) );
t->SetBaseClass(atoi(sep->arg[1]));
t->Save();
t->Kick();
t->Kick("Class was changed.");
}
}
@@ -3904,7 +3904,7 @@ void command_kick(Client *c, const Seperator *sep)
client->Message(0, "You have been kicked by %s", c->GetName());
auto outapp = new EQApplicationPacket(OP_GMKick, 0);
client->QueuePacket(outapp);
client->Kick();
client->Kick("Ordered kicked by command");
c->Message(0, "Kick: local: kicking %s", sep->arg[1]);
}
}
@@ -4499,7 +4499,7 @@ void command_gmzone(Client *c, const Seperator *sep)
identifier = sep->arg[3];
}
std::string bucket_key = StringFormat("%s-%s-instance", zone_short_name, identifier.c_str());
std::string bucket_key = StringFormat("%s-%s-%u-instance", zone_short_name, identifier.c_str(), zone_version);
std::string existing_zone_instance = DataBucket::GetData(bucket_key);
if (existing_zone_instance.length() > 0) {
@@ -5196,7 +5196,7 @@ void command_name(Client *c, const Seperator *sep)
c->Message(0, "Successfully renamed %s to %s", oldname, sep->arg[1]);
// until we get the name packet working right this will work
c->Message(0, "Sending player to char select.");
target->Kick();
target->Kick("Name was changed");
}
else
c->Message(13, "ERROR: Unable to rename %s. Check that the new name '%s' isn't already taken.", oldname, sep->arg[2]);