Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-02 02:43:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: master coordinates moving an instance's players (replace, merge)

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-26 08:40:52 -05:00
parent b1930ed4ed
commit b0f81a1c8f
6 changed files with 415 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dMasterServer/InstanceManager.cpp
View File

@@ -31,6 +31,10 @@ const InstancePtr& InstanceManager::GetInstance(LWOMAPID mapID, bool isFriendTra
auto& instance = FindInstance(mapID, isFriendTransfer, cloneID);
if (instance) return instance;
return CreateInstance(mapID, cloneID);
}
const InstancePtr& InstanceManager::CreateInstance(LWOMAPID mapID, LWOCLONEID cloneID) {
// If we are shutting down, return a nullptr so a new instance is not created.
if (m_IsShuttingDown) {
LOG("Tried to create a new instance map/instance/clone %i/%i/%i, but Master is shutting down.",
@@ -241,7 +245,7 @@ const InstancePtr& InstanceManager::GetInstanceBySysAddr(SystemAddress& sysAddr)
const InstancePtr& InstanceManager::FindInstance(LWOMAPID mapID, bool isFriendTransfer, LWOCLONEID cloneId) {
for (const auto& i : m_Instances) {
if (i && i->GetMapID() == mapID && i->GetCloneID() == cloneId && !i->IsFull(isFriendTransfer) && !i->GetIsPrivate() && !i->GetShutdownComplete() && !i->GetIsShuttingDown()) {
if (i && i->GetMapID() == mapID && i->GetCloneID() == cloneId && !i->IsFull(isFriendTransfer) && !i->GetIsPrivate() && !i->GetShutdownComplete() && !i->GetIsShuttingDown() && !i->GetIsDraining()) {
return i;
}
}
@@ -358,9 +362,11 @@ void Instance::Shutdown() {
bool Instance::IsFull(bool isFriendTransfer) const {
if (!isFriendTransfer && GetSoftCap() > GetCurrentClientCount())
// Seats held for players being moved in count as taken
const int load = GetCurrentClientCount() + GetReserved();
if (!isFriendTransfer && GetSoftCap() > load)
return false;
else if (isFriendTransfer && GetHardCap() > GetCurrentClientCount())
else if (isFriendTransfer && GetHardCap() > load)
return false;
return true;