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

[Commands] Consolidate #lock and #unlock Commands into #serverlock. (#2193)

Browse Source 
- Convert the two commands into one command.
- Cleanup struct naming.
This commit is contained in:
Kinglykrab
2022-05-22 22:30:56 -04:00
committed by GitHub
parent 6b85c914a5
commit 992e4ac59e
7 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/zoneserver.cpp
+8 -8
View File
@@ -972,8 +972,8 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
auto slock = (ServerLock_Struct*) pack->pBuffer;
if (slock->mode >= 1) {
auto l = (ServerLock_Struct*) pack->pBuffer;
if (l->is_locked) {
WorldConfig::LockWorld();
} else {
WorldConfig::UnlockWorld();
@@ -982,24 +982,24 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
if (loginserverlist.Connected()) {
loginserverlist.SendStatus();
SendEmoteMessage(
slock->myname,
l->character_name,
0,
AccountStatus::Player,
Chat::Red,
Chat::Yellow,
fmt::format(
"World {}.",
slock->mode ? "locked" : "unlocked"
l->is_locked ? "locked" : "unlocked"
).c_str()
);
} else {
SendEmoteMessage(
slock->myname,
l->character_name,
0,
AccountStatus::Player,
Chat::Red,
Chat::Yellow,
fmt::format(
"World {}, but login server not connected.",
slock->mode ? "locked" : "unlocked"
l->is_locked ? "locked" : "unlocked"
).c_str()
);
}