Cache build directory when using docker with BuildKit

dChatServer/ChatIgnoreList.cpp

@@ -12,8 +12,8 @@
 // not allowing teams, rejecting DMs, friends requets etc.
 // The only thing not auto-handled is instance activities force joining the team on the server.
 
-void WriteOutgoingReplyHeader(RakNet::BitStream& bitStream, const LWOOBJID& receivingPlayer, const MessageType::Client type) {
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+void WriteOutgoingReplyHeader(RakNet::BitStream& bitStream, const LWOOBJID& receivingPlayer, const ChatIgnoreList::Response type) {
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT,  MessageType::Chat::WORLD_ROUTE_PACKET);
 	bitStream.Write(receivingPlayer);
 
 	//portion that will get routed:
@@ -48,9 +48,9 @@ void ChatIgnoreList::GetIgnoreList(Packet* packet) {
 	}
 
 	CBITSTREAM;
-	WriteOutgoingReplyHeader(bitStream, receiver.playerID, MessageType::Client::GET_IGNORE_LIST_RESPONSE);
+	WriteOutgoingReplyHeader(bitStream, receiver.playerID, ChatIgnoreList::Response::GET_IGNORE);
 
-	bitStream.Write<uint8_t>(false); // Is Free Trial, but we don't care about that
+	bitStream.Write<uint8_t>(false); // Probably is Is Free Trial, but we don't care about that
 	bitStream.Write<uint16_t>(0); // literally spacing due to struct alignment
 
 	bitStream.Write<uint16_t>(receiver.ignoredPlayers.size());
@@ -86,7 +86,7 @@ void ChatIgnoreList::AddIgnore(Packet* packet) {
 	std::string toIgnoreStr = toIgnoreName.GetAsString();
 
 	CBITSTREAM;
-	WriteOutgoingReplyHeader(bitStream, receiver.playerID, MessageType::Client::ADD_IGNORE_RESPONSE);
+	WriteOutgoingReplyHeader(bitStream, receiver.playerID, ChatIgnoreList::Response::ADD_IGNORE);
 
 	// Check if the player exists
 	LWOOBJID ignoredPlayerId = LWOOBJID_EMPTY;
@@ -161,7 +161,7 @@ void ChatIgnoreList::RemoveIgnore(Packet* packet) {
 	receiver.ignoredPlayers.erase(toRemove, receiver.ignoredPlayers.end());
 
 	CBITSTREAM;
-	WriteOutgoingReplyHeader(bitStream, receiver.playerID, MessageType::Client::REMOVE_IGNORE_RESPONSE);
+	WriteOutgoingReplyHeader(bitStream, receiver.playerID, ChatIgnoreList::Response::REMOVE_IGNORE);
 
 	bitStream.Write<int8_t>(0);
 	LUWString playerNameSend(removedIgnoreStr, 33);

dChatServer/ChatIgnoreList.h

@@ -5,16 +5,17 @@ struct Packet;
 
 #include <cstdint>
 
-/**
- * @brief The ignore list allows players to ignore someone silently. Requests will generally be blocked by the client, but they should also be checked
- * on the server as well so the sender can get a generic error code in response.
- *
- */
 namespace ChatIgnoreList {
 	void GetIgnoreList(Packet* packet);
 	void AddIgnore(Packet* packet);
 	void RemoveIgnore(Packet* packet);
 
+	enum class Response : uint8_t {
+		ADD_IGNORE = 32,
+		REMOVE_IGNORE = 33,
+		GET_IGNORE = 34,
+	};
+
 	enum class AddResponse : uint8_t {
 		SUCCESS,
 		ALREADY_IGNORED,

dChatServer/ChatPacketHandler.cpp

@@ -73,7 +73,7 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 		data.Serialize(bitStream);
 	}
 
-	SystemAddress sysAddr = player.worldServerSysAddr;
+	SystemAddress sysAddr = player.sysAddr;
 	SEND_PACKET;
 }
 
@@ -122,7 +122,7 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 			requesteeFriendData.isOnline = false;
 			requesteeFriendData.zoneID = requestor.zoneID;
 			requestee.friends.push_back(requesteeFriendData);
-			requestee.worldServerSysAddr = UNASSIGNED_SYSTEM_ADDRESS;
+			requestee.sysAddr = UNASSIGNED_SYSTEM_ADDRESS;
 			break;
 		}
 	}
@@ -189,8 +189,8 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 				Database::Get()->SetBestFriendStatus(requestorPlayerID, requestee.playerID, bestFriendStatus);
 				// Sent the best friend update here if the value is 3
 				if (bestFriendStatus == 3U) {
-					if (requestee.worldServerSysAddr != UNASSIGNED_SYSTEM_ADDRESS) SendFriendResponse(requestee, requestor, eAddFriendResponseType::ACCEPTED, false, true);
-					if (requestor.worldServerSysAddr != UNASSIGNED_SYSTEM_ADDRESS) SendFriendResponse(requestor, requestee, eAddFriendResponseType::ACCEPTED, false, true);
+					if (requestee.sysAddr != UNASSIGNED_SYSTEM_ADDRESS) SendFriendResponse(requestee, requestor, eAddFriendResponseType::ACCEPTED, false, true);
+					if (requestor.sysAddr != UNASSIGNED_SYSTEM_ADDRESS) SendFriendResponse(requestor, requestee, eAddFriendResponseType::ACCEPTED, false, true);
 
 					for (auto& friendData : requestor.friends) {
 						if (friendData.friendID == requestee.playerID) {
@@ -211,7 +211,7 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 				}
 			}
 		} else {
-			if (requestor.worldServerSysAddr != UNASSIGNED_SYSTEM_ADDRESS) SendFriendResponse(requestor, requestee, eAddFriendResponseType::WAITINGAPPROVAL, true, true);
+			if (requestor.sysAddr != UNASSIGNED_SYSTEM_ADDRESS) SendFriendResponse(requestor, requestee, eAddFriendResponseType::WAITINGAPPROVAL, true, true);
 		}
 	} else {
 		auto maxFriends = Game::playerContainer.GetMaxNumberOfFriends();
@@ -384,7 +384,7 @@ void ChatPacketHandler::HandleWho(Packet* packet) {
 	bitStream.Write(player.zoneID.GetCloneID());
 	bitStream.Write(request.playerName);
 
-	SystemAddress sysAddr = sender.worldServerSysAddr;
+	SystemAddress sysAddr = sender.sysAddr;
 	SEND_PACKET;
 }
 
@@ -418,7 +418,7 @@ void ChatPacketHandler::HandleShowAll(Packet* packet) {
 			}
 		}
 	}
-	SystemAddress sysAddr = sender.worldServerSysAddr;
+	SystemAddress sysAddr = sender.sysAddr;
 	SEND_PACKET;
 }
 
@@ -519,28 +519,6 @@ void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 	SendPrivateChatMessage(sender, receiver, sender, message, eChatChannel::GENERAL, eChatMessageResponseCode::NOTFRIENDS);
 }
 
-void ChatPacketHandler::OnAchievementNotify(RakNet::BitStream& bitstream, const SystemAddress& sysAddr) {
-	ChatPackets::AchievementNotify notify{};
-	notify.Deserialize(bitstream);
-	const auto& playerData = Game::playerContainer.GetPlayerData(notify.earnerName.GetAsString());
-	if (!playerData) return;
-
-	for (const auto& myFriend : playerData.friends) {
-		auto& friendData = Game::playerContainer.GetPlayerData(myFriend.friendID);
-		if (friendData) {
-			notify.targetPlayerName.string = GeneralUtils::ASCIIToUTF16(friendData.playerName);
-			LOG_DEBUG("Sending achievement notify to %s", notify.targetPlayerName.GetAsString().c_str());
-
-			RakNet::BitStream worldStream;
-			BitStreamUtils::WriteHeader(worldStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
-			worldStream.Write(friendData.playerID);
-			notify.WriteHeader(worldStream);
-			notify.Serialize(worldStream);
-			Game::server->Send(worldStream, friendData.worldServerSysAddr, false);
-		}
-	}
-}
-
 void ChatPacketHandler::SendPrivateChatMessage(const PlayerData& sender, const PlayerData& receiver, const PlayerData& routeTo, const LUWString& message, const eChatChannel channel, const eChatMessageResponseCode responseCode) {
 	CBITSTREAM;
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
@@ -559,7 +537,7 @@ void ChatPacketHandler::SendPrivateChatMessage(const PlayerData& sender, const P
 	bitStream.Write(responseCode);
 	bitStream.Write(message);
 
-	SystemAddress sysAddr = routeTo.worldServerSysAddr;
+	SystemAddress sysAddr = routeTo.sysAddr;
 	SEND_PACKET;
 }
 
@@ -602,19 +580,6 @@ void ChatPacketHandler::HandleTeamInvite(Packet* packet) {
 	SendTeamInvite(other, player);
 
 	LOG("Got team invite: %llu -> %s", playerID, invitedPlayer.GetAsString().c_str());
-
-	bool failed = false;
-	for (const auto& ignore : other.ignoredPlayers) {
-		if (ignore.playerId == player.playerID) {
-			failed = true;
-			break;
-		}
-	}
-	
-	ChatPackets::TeamInviteInitialResponse response{};
-	response.inviteFailedToSend = failed;
-	response.playerName = invitedPlayer.string;
-	ChatPackets::SendRoutedMsg(response, playerID, player.worldServerSysAddr);
 }
 
 void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
@@ -628,7 +593,7 @@ void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
 	LWOOBJID leaderID = LWOOBJID_EMPTY;
 	inStream.Read(leaderID);
 
-	LOG("Invite reponse received: %llu -> %llu (%d)", playerID, leaderID, declined);
+	LOG("Accepted invite: %llu -> %llu (%d)", playerID, leaderID, declined);
 
 	if (declined) {
 		return;
@@ -757,15 +722,14 @@ void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
 	const auto& data = Game::playerContainer.GetPlayerData(playerID);
 
 	if (team != nullptr && data) {
-		LOG_DEBUG("Player %llu is requesting team status", playerID);
 		if (team->local && data.zoneID.GetMapID() != team->zoneId.GetMapID() && data.zoneID.GetCloneID() != team->zoneId.GetCloneID()) {
-			Game::playerContainer.RemoveMember(team, playerID, false, false, false, true);
+			Game::playerContainer.RemoveMember(team, playerID, false, false, true, true);
 
 			return;
 		}
 
 		if (team->memberIDs.size() <= 1 && !team->local) {
-			Game::playerContainer.DisbandTeam(team, LWOOBJID_EMPTY, u"");
+			Game::playerContainer.DisbandTeam(team);
 
 			return;
 		}
@@ -808,7 +772,7 @@ void ChatPacketHandler::SendTeamInvite(const PlayerData& receiver, const PlayerD
 	bitStream.Write(LUWString(sender.playerName.c_str()));
 	bitStream.Write(sender.playerID);
 
-	SystemAddress sysAddr = receiver.worldServerSysAddr;
+	SystemAddress sysAddr = receiver.sysAddr;
 	SEND_PACKET;
 }
 
@@ -835,7 +799,7 @@ void ChatPacketHandler::SendTeamInviteConfirm(const PlayerData& receiver, bool b
 		bitStream.Write(character);
 	}
 
-	SystemAddress sysAddr = receiver.worldServerSysAddr;
+	SystemAddress sysAddr = receiver.sysAddr;
 	SEND_PACKET;
 }
 
@@ -860,7 +824,7 @@ void ChatPacketHandler::SendTeamStatus(const PlayerData& receiver, LWOOBJID i64L
 		bitStream.Write(character);
 	}
 
-	SystemAddress sysAddr = receiver.worldServerSysAddr;
+	SystemAddress sysAddr = receiver.sysAddr;
 	SEND_PACKET;
 }
 
@@ -877,7 +841,7 @@ void ChatPacketHandler::SendTeamSetLeader(const PlayerData& receiver, LWOOBJID i
 
 	bitStream.Write(i64PlayerID);
 
-	SystemAddress sysAddr = receiver.worldServerSysAddr;
+	SystemAddress sysAddr = receiver.sysAddr;
 	SEND_PACKET;
 }
 
@@ -906,7 +870,7 @@ void ChatPacketHandler::SendTeamAddPlayer(const PlayerData& receiver, bool bIsFr
 	}
 	bitStream.Write(zoneID);
 
-	SystemAddress sysAddr = receiver.worldServerSysAddr;
+	SystemAddress sysAddr = receiver.sysAddr;
 	SEND_PACKET;
 }
 
@@ -932,7 +896,7 @@ void ChatPacketHandler::SendTeamRemovePlayer(const PlayerData& receiver, bool bD
 		bitStream.Write(character);
 	}
 
-	SystemAddress sysAddr = receiver.worldServerSysAddr;
+	SystemAddress sysAddr = receiver.sysAddr;
 	SEND_PACKET;
 }
 
@@ -953,7 +917,7 @@ void ChatPacketHandler::SendTeamSetOffWorldFlag(const PlayerData& receiver, LWOO
 	}
 	bitStream.Write(zoneID);
 
-	SystemAddress sysAddr = receiver.worldServerSysAddr;
+	SystemAddress sysAddr = receiver.sysAddr;
 	SEND_PACKET;
 }
 
@@ -995,7 +959,7 @@ void ChatPacketHandler::SendFriendUpdate(const PlayerData& friendData, const Pla
 	bitStream.Write<uint8_t>(isBestFriend); //isBFF
 	bitStream.Write<uint8_t>(0); //isFTP
 
-	SystemAddress sysAddr = friendData.worldServerSysAddr;
+	SystemAddress sysAddr = friendData.sysAddr;
 	SEND_PACKET;
 }
 
@@ -1017,7 +981,7 @@ void ChatPacketHandler::SendFriendRequest(const PlayerData& receiver, const Play
 	bitStream.Write(LUWString(sender.playerName));
 	bitStream.Write<uint8_t>(0); // This is a BFF flag however this is unused in live and does not have an implementation client side.
 
-	SystemAddress sysAddr = receiver.worldServerSysAddr;
+	SystemAddress sysAddr = receiver.sysAddr;
 	SEND_PACKET;
 }
 
@@ -1030,7 +994,7 @@ void ChatPacketHandler::SendFriendResponse(const PlayerData& receiver, const Pla
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::ADD_FRIEND_RESPONSE);
 	bitStream.Write(responseCode);
 	// For all requests besides accepted, write a flag that says whether or not we are already best friends with the receiver.
-	bitStream.Write<uint8_t>(responseCode != eAddFriendResponseType::ACCEPTED ? isBestFriendsAlready : sender.worldServerSysAddr != UNASSIGNED_SYSTEM_ADDRESS);
+	bitStream.Write<uint8_t>(responseCode != eAddFriendResponseType::ACCEPTED ? isBestFriendsAlready : sender.sysAddr != UNASSIGNED_SYSTEM_ADDRESS);
 	// Then write the player name
 	bitStream.Write(LUWString(sender.playerName));
 	// Then if this is an acceptance code, write the following extra info.
@@ -1040,7 +1004,7 @@ void ChatPacketHandler::SendFriendResponse(const PlayerData& receiver, const Pla
 		bitStream.Write(isBestFriendRequest); //isBFF
 		bitStream.Write<uint8_t>(0); //isFTP
 	}
-	SystemAddress sysAddr = receiver.worldServerSysAddr;
+	SystemAddress sysAddr = receiver.sysAddr;
 	SEND_PACKET;
 }
 
@@ -1054,6 +1018,6 @@ void ChatPacketHandler::SendRemoveFriend(const PlayerData& receiver, std::string
 	bitStream.Write<uint8_t>(isSuccessful); //isOnline
 	bitStream.Write(LUWString(personToRemove));
 
-	SystemAddress sysAddr = receiver.worldServerSysAddr;
+	SystemAddress sysAddr = receiver.sysAddr;
 	SEND_PACKET;
 }

dChatServer/ChatPacketHandler.h

@@ -64,15 +64,12 @@ namespace ChatPacketHandler {
 	void HandleTeamPromote(Packet* packet);
 	void HandleTeamLootOption(Packet* packet);
 	void HandleTeamStatusRequest(Packet* packet);
-	void OnAchievementNotify(RakNet::BitStream& bitstream, const SystemAddress& sysAddr);
 
 	void SendTeamInvite(const PlayerData& receiver, const PlayerData& sender);
 	void SendTeamInviteConfirm(const PlayerData& receiver, bool bLeaderIsFreeTrial, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, uint8_t ucResponseCode, std::u16string wsLeaderName);
 	void SendTeamStatus(const PlayerData& receiver, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, std::u16string wsLeaderName);
 	void SendTeamSetLeader(const PlayerData& receiver, LWOOBJID i64PlayerID);
 	void SendTeamAddPlayer(const PlayerData& receiver, bool bIsFreeTrial, bool bLocal, bool bNoLootOnDeath, LWOOBJID i64PlayerID, std::u16string wsPlayerName, LWOZONEID zoneID);
-
-	/* Sends a message to the provided `receiver` with information about the updated team. If `i64LeaderID` is not LWOOBJID_EMPTY, the client will update the leader to that new playerID. */
 	void SendTeamRemovePlayer(const PlayerData& receiver, bool bDisband, bool bIsKicked, bool bIsLeaving, bool bLocal, LWOOBJID i64LeaderID, LWOOBJID i64PlayerID, std::u16string wsPlayerName);
 	void SendTeamSetOffWorldFlag(const PlayerData& receiver, LWOOBJID i64PlayerID, LWOZONEID zoneID);
 

dChatServer/ChatServer.cpp

@@ -224,10 +224,6 @@ void HandlePacket(Packet* packet) {
 	if (connection != eConnectionType::CHAT) return;
 	inStream.Read(chatMessageID);
 
-	// Our packing byte wasnt there? Probably a false packet
-	if (inStream.GetNumberOfUnreadBits() < 8) return;
-	inStream.IgnoreBytes(1);
-
 	switch (chatMessageID) {
 	case MessageType::Chat::GM_MUTE:
 		Game::playerContainer.MuteUpdate(packet);
@@ -326,9 +322,6 @@ void HandlePacket(Packet* packet) {
 	case MessageType::Chat::SHOW_ALL:
 		ChatPacketHandler::HandleShowAll(packet);
 		break;
-	case MessageType::Chat::ACHIEVEMENT_NOTIFY:
-		ChatPacketHandler::OnAchievementNotify(inStream, packet->systemAddress);
-		break;
 	case MessageType::Chat::USER_CHANNEL_CHAT_MESSAGE:
 	case MessageType::Chat::WORLD_DISCONNECT_REQUEST:
 	case MessageType::Chat::WORLD_PROXIMITY_RESPONSE:
@@ -364,6 +357,7 @@ void HandlePacket(Packet* packet) {
 	case MessageType::Chat::UGCMANIFEST_REPORT_DONE_BLUEPRINT:
 	case MessageType::Chat::UGCC_REQUEST:
 	case MessageType::Chat::WORLD_PLAYERS_PET_MODERATED_ACKNOWLEDGE:
+	case MessageType::Chat::ACHIEVEMENT_NOTIFY:
 	case MessageType::Chat::GM_CLOSE_PRIVATE_CHAT_WINDOW:
 	case MessageType::Chat::PLAYER_READY:
 	case MessageType::Chat::GET_DONATION_TOTAL:

dChatServer/PlayerContainer.cpp

@@ -52,7 +52,7 @@ void PlayerContainer::InsertPlayer(Packet* packet) {
 	if (!inStream.Read(data.zoneID)) return;
 	if (!inStream.Read(data.muteExpire)) return;
 	if (!inStream.Read(data.gmLevel)) return;
-	data.worldServerSysAddr = packet->systemAddress;
+	data.sysAddr = packet->systemAddress;
 
 	m_Names[data.playerID] = GeneralUtils::UTF8ToUTF16(data.playerName);
 	m_PlayerCount++;
@@ -241,7 +241,7 @@ void PlayerContainer::AddMember(TeamData* team, LWOOBJID playerID) {
 		LOG("Tried to add player to team that already had 4 players");
 		const auto& player = GetPlayerData(playerID);
 		if (!player) return;
-		ChatPackets::SendSystemMessage(player.worldServerSysAddr, u"The teams is full! You have not been added to a team!");
+		ChatPackets::SendSystemMessage(player.sysAddr, u"The teams is full! You have not been added to a team!");
 		return;
 	}
 
@@ -284,39 +284,41 @@ void PlayerContainer::AddMember(TeamData* team, LWOOBJID playerID) {
 	}
 }
 
-void PlayerContainer::RemoveMember(TeamData* team, LWOOBJID causingPlayerID, bool disband, bool kicked, bool leaving, bool silent) {
-	LOG_DEBUG("Player %llu is leaving team %i", causingPlayerID, team->teamID);
-	const auto index = std::ranges::find(team->memberIDs, causingPlayerID);
+void PlayerContainer::RemoveMember(TeamData* team, LWOOBJID playerID, bool disband, bool kicked, bool leaving, bool silent) {
+	const auto index = std::find(team->memberIDs.begin(), team->memberIDs.end(), playerID);
 
 	if (index == team->memberIDs.end()) return;
 
-	team->memberIDs.erase(index);
-
-	const auto& member = GetPlayerData(causingPlayerID);
-
-	const auto causingMemberName = GetName(causingPlayerID);
+	const auto& member = GetPlayerData(playerID);
 
 	if (member && !silent) {
-		ChatPacketHandler::SendTeamRemovePlayer(member, disband, kicked, leaving, team->local, LWOOBJID_EMPTY, causingPlayerID, causingMemberName);
+		ChatPacketHandler::SendTeamSetLeader(member, LWOOBJID_EMPTY);
 	}
 
-	if (team->memberIDs.size() <= 1) {
-		DisbandTeam(team, causingPlayerID, causingMemberName);
-	} else /* team has enough members to be a team still */ {
-		team->leaderID = (causingPlayerID == team->leaderID) ? team->memberIDs[0] : team->leaderID;
-		for (const auto memberId : team->memberIDs) {
-			if (silent && memberId == causingPlayerID) {
-				continue;
-			}
+	const auto memberName = GetName(playerID);
 
-			const auto& otherMember = GetPlayerData(memberId);
-
-			if (!otherMember) continue;
-
-			ChatPacketHandler::SendTeamRemovePlayer(otherMember, disband, kicked, leaving, team->local, team->leaderID, causingPlayerID, causingMemberName);
+	for (const auto memberId : team->memberIDs) {
+		if (silent && memberId == playerID) {
+			continue;
 		}
 
-		UpdateTeamsOnWorld(team, false);
+		const auto& otherMember = GetPlayerData(memberId);
+
+		if (!otherMember) continue;
+
+		ChatPacketHandler::SendTeamRemovePlayer(otherMember, disband, kicked, leaving, false, team->leaderID, playerID, memberName);
+	}
+
+	team->memberIDs.erase(index);
+
+	UpdateTeamsOnWorld(team, false);
+
+	if (team->memberIDs.size() <= 1) {
+		DisbandTeam(team);
+	} else {
+		if (playerID == team->leaderID) {
+			PromoteMember(team, team->memberIDs[0]);
+		}
 	}
 }
 
@@ -332,19 +334,20 @@ void PlayerContainer::PromoteMember(TeamData* team, LWOOBJID newLeader) {
 	}
 }
 
-void PlayerContainer::DisbandTeam(TeamData* team, const LWOOBJID causingPlayerID, const std::u16string& causingPlayerName) {
-	const auto index = std::ranges::find(GetTeams(), team);
+void PlayerContainer::DisbandTeam(TeamData* team) {
+	const auto index = std::find(GetTeams().begin(), GetTeams().end(), team);
 
 	if (index == GetTeams().end()) return;
-	LOG_DEBUG("Disbanding team %i", (*index)->teamID);
 
 	for (const auto memberId : team->memberIDs) {
 		const auto& otherMember = GetPlayerData(memberId);
 
 		if (!otherMember) continue;
 
+		const auto memberName = GeneralUtils::UTF8ToUTF16(otherMember.playerName);
+
 		ChatPacketHandler::SendTeamSetLeader(otherMember, LWOOBJID_EMPTY);
-		ChatPacketHandler::SendTeamRemovePlayer(otherMember, true, false, false, team->local, team->leaderID, causingPlayerID, causingPlayerName);
+		ChatPacketHandler::SendTeamRemovePlayer(otherMember, true, false, false, team->local, team->leaderID, otherMember.playerID, memberName);
 	}
 
 	UpdateTeamsOnWorld(team, true);

dChatServer/PlayerContainer.h

@@ -42,7 +42,7 @@ struct PlayerData {
 		return muteExpire == 1 || muteExpire > time(NULL);
 	}
 
-	SystemAddress worldServerSysAddr{};
+	SystemAddress sysAddr{};
 	LWOZONEID zoneID{};
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	time_t muteExpire = 0;
@@ -91,7 +91,7 @@ public:
 	void AddMember(TeamData* team, LWOOBJID playerID);
 	void RemoveMember(TeamData* team, LWOOBJID playerID, bool disband, bool kicked, bool leaving, bool silent = false);
 	void PromoteMember(TeamData* team, LWOOBJID newLeader);
-	void DisbandTeam(TeamData* team, const LWOOBJID causingPlayerID, const std::u16string& causingPlayerName);
+	void DisbandTeam(TeamData* team);
 	void TeamStatusUpdate(TeamData* team);
 	void UpdateTeamsOnWorld(TeamData* team, bool deleteTeam);
 	std::u16string GetName(LWOOBJID playerID);

dCommon/dEnums/dCommonVars.h

@@ -98,7 +98,6 @@ public:
 	constexpr LWOZONEID() noexcept = default;
 	constexpr LWOZONEID(const LWOMAPID& mapID, const LWOINSTANCEID& instanceID, const LWOCLONEID& cloneID) noexcept { m_MapID = mapID; m_InstanceID = instanceID; m_CloneID = cloneID; }
 	constexpr LWOZONEID(const LWOZONEID& replacement) noexcept { *this = replacement; }
-	constexpr bool operator==(const LWOZONEID&) const = default;
 
 private:
 	LWOMAPID m_MapID = LWOMAPID_INVALID; //1000 for VE, 1100 for AG, etc...

dGame/dMission/Mission.cpp

@@ -27,8 +27,6 @@
 #include "Character.h"
 
 #include "CDMissionEmailTable.h"
-#include "ChatPackets.h"
-#include "PlayerManager.h"
 
 Mission::Mission(MissionComponent* missionComponent, const uint32_t missionId) {
 	m_MissionComponent = missionComponent;
@@ -357,25 +355,12 @@ void Mission::Complete(const bool yieldRewards) {
 	for (const auto& email : missionEmails) {
 		const auto missionEmailBase = "MissionEmail_" + std::to_string(email.ID) + "_";
 
-		if (email.messageType == 1 /* Send an email to the player */) {
+		if (email.messageType == 1) {
 			const auto subject = "%[" + missionEmailBase + "subjectText]";
 			const auto body = "%[" + missionEmailBase + "bodyText]";
 			const auto sender = "%[" + missionEmailBase + "senderName]";
 
 			Mail::SendMail(LWOOBJID_EMPTY, sender, GetAssociate(), subject, body, email.attachmentLOT, 1);
-		} else if (email.messageType == 2 /* Send an announcement in chat */) {
-			auto* character = entity->GetCharacter();
-
-			ChatPackets::AchievementNotify notify{};
-			notify.missionEmailID = email.ID;
-			notify.earningPlayerID = entity->GetObjectID();
-			notify.earnerName.string = character ? GeneralUtils::ASCIIToUTF16(character->GetName()) : u"";
-
-			// Manual write since it's sent to chat server and not a game client
-			RakNet::BitStream bitstream;
-			notify.WriteHeader(bitstream);
-			notify.Serialize(bitstream);
-			Game::chatServer->Send(&bitstream, HIGH_PRIORITY, RELIABLE, 0, Game::chatSysAddr, false);
 		}
 	}
 }

dGame/dUtilities/SlashCommandHandler.cpp

@@ -777,7 +777,7 @@ void SlashCommandHandler::Startup() {
 		.info = "Crashes the server",
 		.aliases = { "crash", "pumpkin" },
 		.handle = DEVGMCommands::Crash,
-		.requiredLevel = eGameMasterLevel::OPERATOR
+		.requiredLevel = eGameMasterLevel::DEVELOPER
 	};
 	RegisterCommand(CrashCommand);
 
@@ -1444,13 +1444,4 @@ void SlashCommandHandler::Startup() {
 		.requiredLevel = eGameMasterLevel::CIVILIAN
 	};
 	RegisterCommand(removeIgnoreCommand);
-
-	Command shutdownCommand{
-		.help = "Shuts this world down",
-		.info = "Shuts this world down",
-		.aliases = {"shutdown"},
-		.handle = DEVGMCommands::Shutdown,
-		.requiredLevel = eGameMasterLevel::DEVELOPER
-	};
-	RegisterCommand(shutdownCommand);
 }

dGame/dUtilities/SlashCommands/DEVGMCommands.cpp

@@ -1622,10 +1622,4 @@ namespace DEVGMCommands {
 			}
 		}
 	}
-
-	void Shutdown(Entity* entity, const SystemAddress& sysAddr, const std::string args) {
-		auto* character = entity->GetCharacter();
-		if (character) LOG("Mythran (%s) has shutdown the world", character->GetName().c_str());
-		Game::OnSignal(-1);
-	}
 };

dGame/dUtilities/SlashCommands/DEVGMCommands.h

@@ -73,7 +73,6 @@ namespace DEVGMCommands {
 	void RollLoot(Entity* entity, const SystemAddress& sysAddr, const std::string args);
 	void CastSkill(Entity* entity, const SystemAddress& sysAddr, const std::string args);
 	void DeleteInven(Entity* entity, const SystemAddress& sysAddr, const std::string args);
-	void Shutdown(Entity* entity, const SystemAddress& sysAddr, const std::string args);
 }
 
 #endif  //!DEVGMCOMMANDS_H

dMasterServer/MasterServer.cpp

@@ -213,13 +213,6 @@ int main(int argc, char** argv) {
 	// Run migrations should any need to be run.
 	MigrationRunner::RunSQLiteMigrations();
 
-	// Check for the --migrations-only flag
-	if ((argc > 1 &&
-		(strcmp(argv[1], "--migrations-only") == 0 || strcmp(argv[1], "-m") == 0))) {
-		LOG("Migrations only flag detected.  Exiting.");
-		return EXIT_SUCCESS;
-	}
-
 	//If the first command line argument is -a or --account then make the user
 	//input a username and password, with the password being hidden.
 	bool createAccount = Database::Get()->GetAccountCount() == 0 && Game::config->GetValue("skip_account_creation") != "1";

dNet/ChatPackets.cpp

@@ -107,44 +107,3 @@ void ChatPackets::Announcement::Send() {
 	bitStream.Write(message);
 	SEND_PACKET_BROADCAST;
 }
-
-void ChatPackets::AchievementNotify::Serialize(RakNet::BitStream& bitstream) const {
-	bitstream.Write<uint64_t>(0); // Packing
-	bitstream.Write<uint32_t>(0); // Packing
-	bitstream.Write<uint8_t>(0); // Packing
-	bitstream.Write(targetPlayerName);
-	bitstream.Write<uint64_t>(0); // Packing / No way to know meaning because of not enough data.
-	bitstream.Write<uint32_t>(0); // Packing / No way to know meaning because of not enough data.
-	bitstream.Write<uint16_t>(0); // Packing / No way to know meaning because of not enough data.
-	bitstream.Write<uint8_t>(0); // Packing / No way to know meaning because of not enough data.
-	bitstream.Write(missionEmailID);
-	bitstream.Write(earningPlayerID);
-	bitstream.Write(earnerName);
-}
-
-bool ChatPackets::AchievementNotify::Deserialize(RakNet::BitStream& bitstream) {
-	bitstream.IgnoreBytes(13);
-	VALIDATE_READ(bitstream.Read(targetPlayerName));
-	bitstream.IgnoreBytes(15);
-	VALIDATE_READ(bitstream.Read(missionEmailID));
-	VALIDATE_READ(bitstream.Read(earningPlayerID));
-	VALIDATE_READ(bitstream.Read(earnerName));
-
-	return true;
-}
-
-void ChatPackets::TeamInviteInitialResponse::Serialize(RakNet::BitStream& bitstream) const {
-	bitstream.Write<uint8_t>(inviteFailedToSend);
-	bitstream.Write(playerName);
-}
-
-void ChatPackets::SendRoutedMsg(const LUBitStream& msg, const LWOOBJID targetID, const SystemAddress& sysAddr) {
-	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
-	bitStream.Write(targetID);
-
-	// Now write the actual packet
-	msg.WriteHeader(bitStream);
-	msg.Serialize(bitStream);
-	Game::server->Send(bitStream, sysAddr, sysAddr == UNASSIGNED_SYSTEM_ADDRESS);
-}

dNet/ChatPackets.h

@@ -10,8 +10,6 @@ struct SystemAddress;
 
 #include <string>
 #include "dCommonVars.h"
-#include "MessageType/Chat.h"
-#include "BitStreamUtils.h"
 
 struct ShowAllRequest{
 	LWOOBJID requestor = LWOOBJID_EMPTY;
@@ -36,29 +34,9 @@ namespace ChatPackets {
 		void Send();
 	};
 
-	struct AchievementNotify : public LUBitStream {
-		LUWString targetPlayerName{};
-		uint32_t missionEmailID{};
-		LWOOBJID earningPlayerID{};
-		LUWString earnerName{};
-		AchievementNotify() : LUBitStream(eConnectionType::CHAT, MessageType::Chat::ACHIEVEMENT_NOTIFY) {}
-		void Serialize(RakNet::BitStream& bitstream) const override;
-		bool Deserialize(RakNet::BitStream& bitstream) override;
-	};
-
-	struct TeamInviteInitialResponse : public LUBitStream {
-		bool inviteFailedToSend{};
-		LUWString playerName{};
-		TeamInviteInitialResponse() : LUBitStream(eConnectionType::CLIENT, MessageType::Client::TEAM_INVITE_INITIAL_RESPONSE) {}
-
-		void Serialize(RakNet::BitStream& bitstream) const override;
-		// No Deserialize needed on our end
-	};
-
 	void SendChatMessage(const SystemAddress& sysAddr, char chatChannel, const std::string& senderName, LWOOBJID playerObjectID, bool senderMythran, const std::u16string& message);
 	void SendSystemMessage(const SystemAddress& sysAddr, const std::u16string& message, bool broadcast = false);
 	void SendMessageFail(const SystemAddress& sysAddr);
-	void SendRoutedMsg(const LUBitStream& msg, const LWOOBJID targetID, const SystemAddress& sysAddr);
 };
 
 #endif // CHATPACKETS_H

dScripts/BaseSurvivalServer.cpp

@@ -503,7 +503,7 @@ void BaseSurvivalServer::ActivateSpawnerNetwork(SpawnerNetworkCollection& spawne
 			if (!possibleSpawners.empty()) {
 				auto* spawnerObject = possibleSpawners.at(0);
 				spawnerObject->Activate();
-				spawnerObject->SoftReset();
+				spawnerObject->Reset();
 			}
 		}
 	}

dScripts/ai/AG/ActSharkPlayerDeathTrigger.cpp

@@ -9,11 +9,10 @@ void ActSharkPlayerDeathTrigger::OnFireEventServerSide(Entity* self, Entity* sen
 		auto missionComponent = sender->GetComponent<MissionComponent>();
 		if (!missionComponent) return;
 
-		// This check is only needed because dlu doesnt have proper collision checks on rotated phantom physics
-		if (sender->GetIsDead() || !sender->GetPlayerReadyForUpdates()) return; //Don't kill already dead players or players not ready
-		
 		missionComponent->Progress(eMissionTaskType::SCRIPT, 8419);
 
+		if (sender->GetIsDead() || !sender->GetPlayerReadyForUpdates()) return; //Don't kill already dead players or players not ready
+
 		if (sender->GetCharacter()) {
 			sender->Smash(self->GetObjectID(), eKillType::VIOLENT, u"big-shark-death");
 		}

dWorldServer/PerformanceManager.cpp

@@ -3,68 +3,69 @@
 #include "CDClientManager.h"
 #include "UserManager.h"
 
-#define SOCIAL lowFrameDelta
-#define SOCIAL_HUB mediumFrameDelta //Added to compensate for the large playercounts in NS and NT
-#define BATTLE highFrameDelta
-#define BATTLE_INSTANCE mediumFrameDelta
-#define RACE highFrameDelta
-#define PROPERTY lowFrameDelta
+#define SOCIAL { lowFrameDelta }
+#define SOCIAL_HUB { mediumFrameDelta } //Added to compensate for the large playercounts in NS and NT
+#define BATTLE { highFrameDelta }
+#define BATTLE_INSTANCE { mediumFrameDelta }
+#define RACE { highFrameDelta }
+#define PROPERTY { lowFrameDelta }
 
-namespace {
-	PerformanceProfile m_CurrentProfile = SOCIAL;
-	PerformanceProfile m_DefaultProfile = SOCIAL;
-	PerformanceProfile m_InactiveProfile = lowFrameDelta;
-	std::map<LWOMAPID, PerformanceProfile> m_Profiles = {
-		// VE
-		{ 1000, SOCIAL },
+PerformanceProfile PerformanceManager::m_CurrentProfile = SOCIAL;
 
-		// AG
-		{ 1100, BATTLE },
-		{ 1101, BATTLE_INSTANCE },
-		{ 1102, BATTLE_INSTANCE },
-		{ 1150, PROPERTY },
-		{ 1151, PROPERTY },
+PerformanceProfile PerformanceManager::m_DefaultProfile = SOCIAL;
 
-		// NS
-		{ 1200, SOCIAL_HUB },
-		{ 1201, SOCIAL },
-		{ 1203, RACE },
-		{ 1204, BATTLE_INSTANCE },
-		{ 1250, PROPERTY },
-		{ 1251, PROPERTY },
+PerformanceProfile PerformanceManager::m_InactiveProfile = { lowFrameDelta };
 
-		// GF
-		{ 1300, BATTLE },
-		{ 1302, BATTLE_INSTANCE },
-		{ 1303, BATTLE_INSTANCE },
-		{ 1350, PROPERTY },
+std::map<LWOMAPID, PerformanceProfile> PerformanceManager::m_Profiles = {
+	// VE
+	{ 1000, SOCIAL },
 
-		// FV
-		{ 1400, BATTLE },
-		{ 1402, BATTLE_INSTANCE },
-		{ 1403, RACE },
-		{ 1450, PROPERTY },
+	// AG
+	{ 1100, BATTLE },
+	{ 1101, BATTLE_INSTANCE },
+	{ 1102, BATTLE_INSTANCE },
+	{ 1150, PROPERTY },
+	{ 1151, PROPERTY },
 
-		// LUP
-		{ 1600, SOCIAL },
-		{ 1601, SOCIAL },
-		{ 1602, SOCIAL },
-		{ 1603, SOCIAL },
-		{ 1604, SOCIAL },
+	// NS
+	{ 1200, SOCIAL_HUB },
+	{ 1201, SOCIAL },
+	{ 1203, RACE },
+	{ 1204, BATTLE_INSTANCE },
+	{ 1250, PROPERTY },
+	{ 1251, PROPERTY },
 
-		// LEGO Club
-		{ 1700, SOCIAL },
+	// GF
+	{ 1300, BATTLE },
+	{ 1302, BATTLE_INSTANCE },
+	{ 1303, BATTLE_INSTANCE },
+	{ 1350, PROPERTY },
 
-		// AM
-		{ 1800, BATTLE },
+	// FV
+	{ 1400, BATTLE },
+	{ 1402, BATTLE_INSTANCE },
+	{ 1403, RACE },
+	{ 1450, PROPERTY },
 
-		// NT
-		{ 1900, SOCIAL_HUB },
+	// LUP
+	{ 1600, SOCIAL },
+	{ 1601, SOCIAL },
+	{ 1602, SOCIAL },
+	{ 1603, SOCIAL },
+	{ 1604, SOCIAL },
 
-		// NJ
-		{ 2000, BATTLE },
-		{ 2001, BATTLE_INSTANCE },
-	};
+	// LEGO Club
+	{ 1700, SOCIAL },
+
+	// AM
+	{ 1800, BATTLE },
+
+	// NT
+	{ 1900, SOCIAL_HUB },
+
+	// NJ
+	{ 2000, BATTLE },
+	{ 2001, BATTLE_INSTANCE },
 };
 
 void PerformanceManager::SelectProfile(LWOMAPID mapID) {
@@ -73,16 +74,16 @@ void PerformanceManager::SelectProfile(LWOMAPID mapID) {
 	if (zoneTable) {
 		const CDZoneTable* zone = zoneTable->Query(mapID);
 		if (zone) {
-			if (zone->serverPhysicsFramerate == "high") {
-				m_CurrentProfile = highFrameDelta;
+			if (zone->serverPhysicsFramerate == "high"){
+				m_CurrentProfile = { highFrameDelta };
 				return;
 			}
-			if (zone->serverPhysicsFramerate == "medium") {
-				m_CurrentProfile = mediumFrameDelta;
+			if (zone->serverPhysicsFramerate == "medium"){
+				m_CurrentProfile = { mediumFrameDelta };
 				return;
 			}
-			if (zone->serverPhysicsFramerate == "low") {
-				m_CurrentProfile = lowFrameDelta;
+			if (zone->serverPhysicsFramerate == "low"){
+				m_CurrentProfile = { lowFrameDelta };
 				return;
 			}
 		}
@@ -90,9 +91,18 @@ void PerformanceManager::SelectProfile(LWOMAPID mapID) {
 
 	// Fall back to hardcoded list and defaults
 	const auto pair = m_Profiles.find(mapID);
-	m_CurrentProfile = pair == m_Profiles.end() ? m_DefaultProfile : pair->second;
+	if (pair == m_Profiles.end()) {
+		m_CurrentProfile = m_DefaultProfile;
+		return;
+	}
+
+	m_CurrentProfile = pair->second;
 }
 
 uint32_t PerformanceManager::GetServerFrameDelta() {
-	return UserManager::Instance()->GetUserCount() == 0 ? m_CurrentProfile : m_InactiveProfile;
+	if (UserManager::Instance()->GetUserCount() == 0) {
+		return m_InactiveProfile.serverFrameDelta;
+	}
+
+	return m_CurrentProfile.serverFrameDelta;
 }

dWorldServer/PerformanceManager.h

@@ -1,16 +1,22 @@
 #pragma once
 
-#include <cstdint>
 #include <map>
 
 #include "dCommonVars.h"
 
-using PerformanceProfile = uint32_t;
-
-namespace PerformanceManager {
-	/* Sets a performance profile for a given world. */
-	void SelectProfile(LWOMAPID mapID);
-
-	/* Gets the frame millisecond delta. Will return a higher value if the zone is empty. */
-	uint32_t GetServerFrameDelta();
+struct PerformanceProfile {
+	uint32_t serverFrameDelta;
+};
+
+class PerformanceManager {
+public:
+	static void SelectProfile(LWOMAPID mapID);
+
+	static uint32_t GetServerFrameDelta();
+
+private:
+	static PerformanceProfile m_CurrentProfile;
+	static PerformanceProfile m_DefaultProfile;
+	static PerformanceProfile m_InactiveProfile;
+	static std::map<LWOMAPID, PerformanceProfile> m_Profiles;
 };

dWorldServer/WorldServer.cpp

@@ -98,22 +98,9 @@ namespace Game {
 	std::string projectVersion = PROJECT_VERSION;
 } // namespace Game
 
-namespace {
-	struct TempSessionInfo {
-		SystemAddress sysAddr;
-		std::string hash;
-	};
-
-	std::map<std::string, TempSessionInfo> g_PendingUsers;
-	uint32_t g_InstanceID = 0;
-	uint32_t g_CloneID = 0;
-	std::string g_DatabaseChecksum = "";
-
-	bool g_ChatDisabled = false;
-	bool g_ChatConnected = false;
-	bool g_WorldShutdownSequenceComplete = false;
-}; // namespace anonymous
-
+bool chatDisabled = false;
+bool chatConnected = false;
+bool worldShutdownSequenceComplete = false;
 void WorldShutdownSequence();
 void WorldShutdownProcess(uint32_t zoneId);
 void FinalizeShutdown();
@@ -123,6 +110,16 @@ void HandlePacketChat(Packet* packet);
 void HandleMasterPacket(Packet* packet);
 void HandlePacket(Packet* packet);
 
+struct tempSessionInfo {
+	SystemAddress sysAddr;
+	std::string hash;
+};
+
+std::map<std::string, tempSessionInfo> m_PendingUsers;
+uint32_t instanceID = 0;
+uint32_t g_CloneID = 0;
+std::string databaseChecksum = "";
+
 int main(int argc, char** argv) {
 	Diagnostics::SetProcessName("World");
 	Diagnostics::SetProcessFileName(argv[0]);
@@ -140,31 +137,27 @@ int main(int argc, char** argv) {
 	uint32_t ourPort = 2007;
 
 	//Check our arguments:
-	for (int32_t i = 0; (i + 1) < argc; i++) {
+	for (int32_t i = 0; i < argc; ++i) {
 		std::string argument(argv[i]);
-		const auto valOptional = GeneralUtils::TryParse<uint32_t>(argv[i + 1]);
-		if (!valOptional) {
-			continue;
-		}
 
-		if (argument == "-zone") zoneID = valOptional.value_or(1000);
-		else if (argument == "-instance") g_InstanceID = valOptional.value_or(0);
-		else if (argument == "-clone") cloneID = valOptional.value_or(0);
-		else if (argument == "-maxclients") maxClients = valOptional.value_or(8);
-		else if (argument == "-port") ourPort = valOptional.value_or(2007);
+		if (argument == "-zone") zoneID = atoi(argv[i + 1]);
+		if (argument == "-instance") instanceID = atoi(argv[i + 1]);
+		if (argument == "-clone") cloneID = atoi(argv[i + 1]);
+		if (argument == "-maxclients") maxClients = atoi(argv[i + 1]);
+		if (argument == "-port") ourPort = atoi(argv[i + 1]);
 	}
 
 	Game::config = new dConfig("worldconfig.ini");
 
 	//Create all the objects we need to run our service:
-	Server::SetupLogger("WorldServer_" + std::to_string(zoneID) + "_" + std::to_string(g_InstanceID));
+	Server::SetupLogger("WorldServer_" + std::to_string(zoneID) + "_" + std::to_string(instanceID));
 	if (!Game::logger) return EXIT_FAILURE;
 
 	LOG("Starting World server...");
 	LOG("Version: %s", Game::projectVersion.c_str());
 	LOG("Compiled on: %s", __TIMESTAMP__);
 
-	g_ChatDisabled = Game::config->GetValue("disable_chat") == "1";
+	if (Game::config->GetValue("disable_chat") == "1") chatDisabled = true;
 
 	try {
 		std::string clientPathStr = Game::config->GetValue("client_location");
@@ -174,7 +167,7 @@ int main(int argc, char** argv) {
 			clientPath = BinaryPathFinder::GetBinaryDir() / clientPath;
 		}
 		Game::assetManager = new AssetManager(clientPath);
-	} catch (const std::exception& ex) {
+	} catch (std::runtime_error& ex) {
 		LOG("Got an error while setting up assets: %s", ex.what());
 
 		return EXIT_FAILURE;
@@ -183,14 +176,11 @@ int main(int argc, char** argv) {
 	// Connect to CDClient
 	try {
 		CDClientDatabase::Connect((BinaryPathFinder::GetBinaryDir() / "resServer" / "CDServer.sqlite").string());
-	} catch (const CppSQLite3Exception& e) {
+	} catch (CppSQLite3Exception& e) {
 		LOG("Unable to connect to CDServer SQLite Database");
 		LOG("Error: %s", e.errorMessage());
 		LOG("Error Code: %i", e.errorCode());
 		return EXIT_FAILURE;
-	} catch (const std::exception& e) {
-		LOG("Caught generic exception %s when connecting to CDClient", e.what());
-		return EXIT_FAILURE;
 	}
 
 	CDClientManager::LoadValuesFromDatabase();
@@ -204,7 +194,7 @@ int main(int argc, char** argv) {
 	//Connect to the MySQL Database:
 	try {
 		Database::Connect();
-	} catch (const std::exception& ex) {
+	} catch (std::exception& ex) {
 		LOG("Got an error while connecting to the database: %s", ex.what());
 		return EXIT_FAILURE;
 	}
@@ -213,7 +203,7 @@ int main(int argc, char** argv) {
 	std::string masterIP = "localhost";
 	uint32_t masterPort = 1000;
 	std::string masterPassword;
-	const auto masterInfo = Database::Get()->GetMasterInfo();
+	auto masterInfo = Database::Get()->GetMasterInfo();
 
 	if (masterInfo) {
 		masterIP = masterInfo->ip;
@@ -226,25 +216,13 @@ int main(int argc, char** argv) {
 	const bool dontGenerateDCF = GeneralUtils::TryParse<bool>(Game::config->GetValue("dont_generate_dcf")).value_or(false);
 	Game::chatFilter = new dChatFilter(Game::assetManager->GetResPath().string() + "/chatplus_en_us", dontGenerateDCF);
 
-	Game::server = new dServer(masterIP,
-		ourPort,
-		g_InstanceID,
-		maxClients,
-		false /* Is internal */,
-		true /* Use encryption */,
-		Game::logger,
-		masterIP,
-		masterPort,
-		ServerType::World,
-		Game::config,
-		&Game::lastSignal,
-		masterPassword,
-		zoneID);
+	Game::server = new dServer(masterIP, ourPort, instanceID, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::World, Game::config, &Game::lastSignal, masterPassword, zoneID);
 
 	//Connect to the chat server:
-	uint32_t chatPort = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("chat_server_port")).value_or(1501);
+	uint32_t chatPort = 1501;
+	if (Game::config->GetValue("chat_server_port") != "") chatPort = std::atoi(Game::config->GetValue("chat_server_port").c_str());
 
-	auto chatSock = SocketDescriptor(static_cast<uint16_t>(ourPort + 2), NULL);
+	auto chatSock = SocketDescriptor(static_cast<uint16_t>(ourPort + 2), 0);
 	Game::chatServer = RakNetworkFactory::GetRakPeerInterface();
 	Game::chatServer->Startup(1, 30, &chatSock, 1);
 	Game::chatServer->Connect(masterIP.c_str(), chatPort, NET_PASSWORD_EXTERNAL, strnlen(NET_PASSWORD_EXTERNAL, sizeof(NET_PASSWORD_EXTERNAL)));
@@ -282,8 +260,9 @@ int main(int argc, char** argv) {
 	//Load our level:
 	if (zoneID != 0) {
 		dpWorld::Initialize(zoneID);
-		Game::zoneManager->Initialize(LWOZONEID(zoneID, g_InstanceID, cloneID));
+		Game::zoneManager->Initialize(LWOZONEID(zoneID, instanceID, cloneID));
 		g_CloneID = cloneID;
+
 	} else {
 		Game::entityManager->Initialize();
 	}
@@ -307,11 +286,11 @@ int main(int argc, char** argv) {
 			const char* nullTerminateBuffer = "\0";
 			md5.update(nullTerminateBuffer, 1); // null terminate the data
 			md5.finalize();
-			g_DatabaseChecksum = md5.hexdigest();
+			databaseChecksum = md5.hexdigest();
 
-			LOG("FDB Checksum calculated as: %s", g_DatabaseChecksum.c_str());
+			LOG("FDB Checksum calculated as: %s", databaseChecksum.c_str());
 		}
-		if (g_DatabaseChecksum.empty()) {
+		if (databaseChecksum.empty()) {
 			LOG("check_fdb is on but no fdb file found.");
 			return EXIT_FAILURE;
 		}
@@ -355,7 +334,7 @@ int main(int argc, char** argv) {
 			float_t ratioBeforeToAfter = static_cast<float>(currentFrameDelta) / static_cast<float>(newFrameDelta);
 			currentFrameDelta = newFrameDelta;
 			currentFramerate = MS_TO_FRAMES(newFrameDelta);
-			LOG_DEBUG("Framerate for zone/instance/clone %i/%i/%i is now %i", zoneID, g_InstanceID, cloneID, currentFramerate);
+			LOG_DEBUG("Framerate for zone/instance/clone %i/%i/%i is now %i", zoneID, instanceID, cloneID, currentFramerate);
 			logFlushTime = 15 * currentFramerate; // 15 seconds in frames
 			framesSinceLastFlush *= ratioBeforeToAfter;
 			shutdownTimeout = 10 * 60 * currentFramerate; // 10 minutes in frames
@@ -388,7 +367,7 @@ int main(int argc, char** argv) {
 		} else framesSinceMasterDisconnect = 0;
 
 		// Check if we're still connected to chat:
-		if (!g_ChatConnected) {
+		if (!chatConnected) {
 			framesSinceChatDisconnect++;
 
 			if (framesSinceChatDisconnect >= chatReconnectionTime) {
@@ -425,18 +404,16 @@ int main(int argc, char** argv) {
 
 		//Check for packets here:
 		packet = Game::server->ReceiveFromMaster();
-		while (packet) { //We can get messages not handle-able by the dServer class, so handle them if we returned anything.
+		if (packet) { //We can get messages not handle-able by the dServer class, so handle them if we returned anything.
 			HandleMasterPacket(packet);
 			Game::server->DeallocateMasterPacket(packet);
-			packet = Game::server->ReceiveFromMaster();
 		}
 
 		//Handle our chat packets:
 		packet = Game::chatServer->Receive();
-		while (packet) {
+		if (packet) {
 			HandlePacketChat(packet);
 			Game::chatServer->DeallocatePacket(packet);
-			packet = Game::chatServer->Receive();
 		}
 
 		//Handle world-specific packets:
@@ -444,6 +421,7 @@ int main(int argc, char** argv) {
 
 		UserManager::Instance()->DeletePendingRemovals();
 
+		auto t1 = std::chrono::high_resolution_clock::now();
 		for (uint32_t curPacket = 0; curPacket < maxPacketsToProcess && timeSpent < maxPacketProcessingTime; curPacket++) {
 			packet = Game::server->Receive();
 			if (packet) {
@@ -519,14 +497,20 @@ int main(int argc, char** argv) {
 		Metrics::EndMeasurement(MetricVariable::Sleep);
 
 		if (!ready && Game::server->GetIsConnectedToMaster()) {
-			LOG("Finished loading world with zone (%i), ready up!", Game::server->GetZoneID());
+			// Some delay is required here or else we crash the client?
 
-			MasterPackets::SendWorldReady(Game::server, Game::server->GetZoneID(), Game::server->GetInstanceID());
+			framesSinceMasterStatus++;
 
-			ready = true;
+			if (framesSinceMasterStatus >= 200) {
+				LOG("Finished loading world with zone (%i), ready up!", Game::server->GetZoneID());
+
+				MasterPackets::SendWorldReady(Game::server, Game::server->GetZoneID(), Game::server->GetInstanceID());
+
+				ready = true;
+			}
 		}
 
-		if (Game::ShouldShutdown() && !g_WorldShutdownSequenceComplete) {
+		if (Game::ShouldShutdown() && !worldShutdownSequenceComplete) {
 			WorldShutdownProcess(zoneID);
 			break;
 		}
@@ -543,14 +527,14 @@ void HandlePacketChat(Packet* packet) {
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) {
 		LOG("Lost our connection to chat, zone(%i), instance(%i)", Game::server->GetZoneID(), Game::server->GetInstanceID());
 
-		g_ChatConnected = false;
+		chatConnected = false;
 	}
 
 	if (packet->data[0] == ID_CONNECTION_REQUEST_ACCEPTED) {
 		LOG("Established connection to chat, zone(%i), instance (%i)", Game::server->GetZoneID(), Game::server->GetInstanceID());
 		Game::chatSysAddr = packet->systemAddress;
 
-		g_ChatConnected = true;
+		chatConnected = true;
 	}
 
 	if (packet->data[0] == ID_USER_PACKET_ENUM && packet->length >= 4) {
@@ -650,13 +634,13 @@ void HandlePacketChat(Packet* packet) {
 
 				inStream.Read(lootOption);
 				inStream.Read(memberCount);
-				LOG("Updating team ID:(%llu), Loot:(%i), #Members:(%i)", teamID, lootOption, memberCount);
+				LOG("Updating team (%llu), (%i), (%i)", teamID, lootOption, memberCount);
 				for (char i = 0; i < memberCount; i++) {
 					LWOOBJID member = LWOOBJID_EMPTY;
 					inStream.Read(member);
 					members.push_back(member);
 
-					LOG("Added member (%llu) to the team", member);
+					LOG("Updating team member (%llu)", member);
 				}
 
 				TeamManager::Instance()->UpdateTeam(teamID, lootOption, members);
@@ -664,7 +648,7 @@ void HandlePacketChat(Packet* packet) {
 				break;
 			}
 			default:
-				LOG("Received an unknown chat: %s", StringifiedEnum::ToString(static_cast<MessageType::Chat>(packet->data[3])).data());
+				LOG("Received an unknown chat: %i", int(packet->data[3]));
 			}
 		}
 	}
@@ -693,8 +677,8 @@ void HandleMasterPacket(Packet* packet) {
 		inStream.Read(username);
 
 		//Find them:
-		auto it = g_PendingUsers.find(username.GetAsString());
-		if (it == g_PendingUsers.end()) return;
+		auto it = m_PendingUsers.find(username.GetAsString());
+		if (it == m_PendingUsers.end()) return;
 
 		//Convert our key:
 		std::string userHash = std::to_string(sessionKey);
@@ -734,14 +718,14 @@ void HandleMasterPacket(Packet* packet) {
 				UserManager::Instance()->RequestCharacterList(it->second.sysAddr);
 			}
 
-			g_PendingUsers.erase(username.GetAsString());
+			m_PendingUsers.erase(username.GetAsString());
 
 			//Notify master:
 			{
 				CBITSTREAM;
 				BitStreamUtils::WriteHeader(bitStream, eConnectionType::MASTER, MessageType::Master::PLAYER_ADDED);
 				bitStream.Write<LWOMAPID>(Game::server->GetZoneID());
-				bitStream.Write<LWOINSTANCEID>(g_InstanceID);
+				bitStream.Write<LWOINSTANCEID>(instanceID);
 				Game::server->SendToMaster(bitStream);
 			}
 		}
@@ -844,7 +828,7 @@ void HandlePacket(Packet* packet) {
 		CBITSTREAM;
 		BitStreamUtils::WriteHeader(bitStream, eConnectionType::MASTER, MessageType::Master::PLAYER_REMOVED);
 		bitStream.Write<LWOMAPID>(Game::server->GetZoneID());
-		bitStream.Write<LWOINSTANCEID>(g_InstanceID);
+		bitStream.Write<LWOINSTANCEID>(instanceID);
 		Game::server->SendToMaster(bitStream);
 	}
 
@@ -875,7 +859,7 @@ void HandlePacket(Packet* packet) {
 		inStream.Read(clientDatabaseChecksum);
 
 		// If the check is turned on, validate the client's database checksum.
-		if (Game::config->GetValue("check_fdb") == "1" && !g_DatabaseChecksum.empty()) {
+		if (Game::config->GetValue("check_fdb") == "1" && !databaseChecksum.empty()) {
 			auto accountInfo = Database::Get()->GetAccountInfo(username.GetAsString());
 			if (!accountInfo) {
 				LOG("Client's account does not exist in the database, aborting connection.");
@@ -884,7 +868,7 @@ void HandlePacket(Packet* packet) {
 			}
 
 			// Developers may skip this check
-			if (clientDatabaseChecksum.string != g_DatabaseChecksum) {
+			if (clientDatabaseChecksum.string != databaseChecksum) {
 
 				if (accountInfo->maxGmLevel < eGameMasterLevel::DEVELOPER) {
 					LOG("Client's database checksum does not match the server's, aborting connection.");
@@ -916,10 +900,10 @@ void HandlePacket(Packet* packet) {
 		Game::server->SendToMaster(bitStream);
 
 		//Insert info into our pending list
-		TempSessionInfo info;
-		info.sysAddr = packet->systemAddress;
+		tempSessionInfo info;
+		info.sysAddr = SystemAddress(packet->systemAddress);
 		info.hash = sessionKey.GetAsString();
-		g_PendingUsers[username.GetAsString()] = info;
+		m_PendingUsers.insert(std::make_pair(username.GetAsString(), info));
 
 		break;
 	}
@@ -934,8 +918,8 @@ void HandlePacket(Packet* packet) {
 
 		//This loops prevents users who aren't authenticated to double-request the char list, which
 		//would make the login screen freeze sometimes.
-		if (g_PendingUsers.size() > 0) {
-			for (const auto& it : g_PendingUsers) {
+		if (m_PendingUsers.size() > 0) {
+			for (auto it : m_PendingUsers) {
 				if (it.second.sysAddr == packet->systemAddress) {
 					return;
 				}
@@ -1319,7 +1303,7 @@ void HandlePacket(Packet* packet) {
 	}
 
 	case MessageType::World::GENERAL_CHAT_MESSAGE: {
-		if (g_ChatDisabled) {
+		if (chatDisabled) {
 			ChatPackets::SendMessageFail(packet->systemAddress);
 		} else {
 			auto chatMessage = ClientPackets::HandleChatMessage(packet);
@@ -1412,7 +1396,7 @@ void HandlePacket(Packet* packet) {
 }
 
 void WorldShutdownProcess(uint32_t zoneId) {
-	LOG("Saving map %i instance %i", zoneId, g_InstanceID);
+	LOG("Saving map %i instance %i", zoneId, instanceID);
 	for (auto i = 0; i < Game::server->GetReplicaManager()->GetParticipantCount(); ++i) {
 		const auto& player = Game::server->GetReplicaManager()->GetParticipantAtIndex(i);
 
@@ -1437,7 +1421,7 @@ void WorldShutdownProcess(uint32_t zoneId) {
 		LOG("ALL property data saved for zone %i clone %i!", zoneId, PropertyManagementComponent::Instance()->GetCloneId());
 	}
 
-	LOG("ALL DATA HAS BEEN SAVED FOR ZONE %i INSTANCE %i!", zoneId, g_InstanceID);
+	LOG("ALL DATA HAS BEEN SAVED FOR ZONE %i INSTANCE %i!", zoneId, instanceID);
 
 	while (Game::server->GetReplicaManager()->GetParticipantCount() > 0) {
 		const auto& player = Game::server->GetReplicaManager()->GetParticipantAtIndex(0);
@@ -1448,7 +1432,7 @@ void WorldShutdownProcess(uint32_t zoneId) {
 }
 
 void WorldShutdownSequence() {
-	bool shouldShutdown = Game::ShouldShutdown() || g_WorldShutdownSequenceComplete;
+	bool shouldShutdown = Game::ShouldShutdown() || worldShutdownSequenceComplete;
 	Game::lastSignal = -1;
 #ifndef DARKFLAME_PLATFORM_WIN32
 	if (shouldShutdown)
@@ -1459,13 +1443,13 @@ void WorldShutdownSequence() {
 
 	if (!Game::logger) return;
 
-	LOG("Zone (%i) instance (%i) shutting down outside of main loop!", Game::server->GetZoneID(), g_InstanceID);
+	LOG("Zone (%i) instance (%i) shutting down outside of main loop!", Game::server->GetZoneID(), instanceID);
 	WorldShutdownProcess(Game::server->GetZoneID());
 	FinalizeShutdown();
 }
 
 void FinalizeShutdown() {
-	LOG("Shutdown complete, zone (%i), instance (%i)", Game::server->GetZoneID(), g_InstanceID);
+	LOG("Shutdown complete, zone (%i), instance (%i)", Game::server->GetZoneID(), instanceID);
 
 	//Delete our objects here:
 	Metrics::Clear();
@@ -1484,7 +1468,7 @@ void FinalizeShutdown() {
 	if (Game::logger) delete Game::logger;
 	Game::logger = nullptr;
 
-	g_WorldShutdownSequenceComplete = true;
+	worldShutdownSequenceComplete = true;
 
 	exit(EXIT_SUCCESS);
 }

tests/dGameTests/GameDependencies.cpp

@@ -12,5 +12,4 @@ namespace Game {
 	SystemAddress chatSysAddr;
 	EntityManager* entityManager = nullptr;
 	std::string projectVersion;
-	Game::signal_t lastSignal = 0;
 }

thirdparty/SQLite/CppSQLite3.h

@@ -52,9 +52,9 @@ public:
 
     virtual ~CppSQLite3Exception();
 
-    const int errorCode() const { return mnErrCode; }
+    const int errorCode() { return mnErrCode; }
 
-    const char* errorMessage() const { return mpszErrMess; }
+    const char* errorMessage() { return mpszErrMess; }
     
     const char* what() const noexcept override { return mpszErrMess; }