Merge branch 'master' of https://github.com/EQEmu/Server into kick_events

This commit is contained in:
Akkadius
2019-08-10 02:38:48 -05:00
20 changed files with 794 additions and 396 deletions
+1 -1
View File
@@ -4490,7 +4490,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) {