Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-14 07:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tell the player when the zone they go to gets no instance

Browse Source 
The master server dropped a transfer request it started no instance
for, so the world server never heard back and the player waited. It
now answers the request with an empty address and the reason in place
of the port: no room for another instance (max_instances), a zone that
is not in the ZoneTable, or another reason. A request for a private
zone that does not exist is answered the same way.

The world server passes this on as a TRANSFER_TO_WORLD without an
address, which the client shows as a failed map change, and leaves the
character where it is. The auth server fails the login when there is
no character select to send the player to.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 16:06:31 -06:00
parent 24294561ae
commit ebcfd54915
16 changed files with 132 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dMasterServer/InstanceManager.cpp
View File

@@ -43,6 +43,17 @@ namespace {
}
}
void InstanceManager::SendTransferFailure(const PendingInstanceRequest& request, const LWOMAPID mapID, const LWOCLONEID cloneID, const eTransferFailure failure) {
MasterPackets::RequestZoneTransferResponse response;
response.requestID = request.id;
response.mythranShift = request.mythranShift;
response.zoneID = mapID;
response.zoneClone = cloneID;
response.serverPort = static_cast<uint16_t>(failure);
response.stamps = request.stamps;
MasterPackets::SendTo(request.sysAddr, response);
}
InstanceManager::InstanceManager(const std::string& externalIP) : mExternalIP{ externalIP } {
m_LastPort =
GeneralUtils::TryParse<uint16_t>(Game::config->GetValue("world_port_start")).value_or(m_LastPort);
@@ -51,10 +62,13 @@ InstanceManager::InstanceManager(const std::string& externalIP) : mExternalIP{ e
GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_instances")).value_or(InstanceLimits::DefaultMaxInstances);
}
bool InstanceManager::CanCreateInstance(const LWOMAPID mapID, const LWOCLONEID cloneID) const {
InstanceLimits::eNewInstance InstanceManager::CheckNewInstance(const LWOMAPID mapID) const {
const bool isInZoneTable = mapID != 0 && CDZoneTableTable::Query(mapID) != nullptr;
return InstanceLimits::CheckNewInstance(mapID, isInZoneTable, m_Instances.size(), m_MaxInstances);
}
switch (InstanceLimits::CheckNewInstance(mapID, isInZoneTable, m_Instances.size(), m_MaxInstances)) {
bool InstanceManager::CanCreateInstance(const LWOMAPID mapID, const LWOCLONEID cloneID) const {
switch (CheckNewInstance(mapID)) {
case InstanceLimits::eNewInstance::UnknownZone:
LOG("Tried to create an instance of map %i/%i, which is not in the ZoneTable.", mapID, cloneID);
return false;
@@ -315,6 +329,13 @@ void InstanceManager::RedirectPendingRequests(const InstancePtr& instance) {
for (const auto& request : instance->GetPendingAffirmations()) {
const auto& in = Game::im->GetInstance(zoneId.GetMapID(), false, zoneId.GetCloneID());
if (!in) {
// No instance takes the place of the one that is gone, so the transfer fails
const auto failure = InstanceLimits::TransferFailure(CheckNewInstance(zoneId.GetMapID()));
SendTransferFailure(request, zoneId.GetMapID(), zoneId.GetCloneID(), failure);
continue;
}
if (in && !in->GetIsReady()) // Instance not ready, make a pending request
{
in->GetPendingRequests().push_back(request);