Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-09 00:48:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into moreMovementAi

Browse Source
This commit is contained in:
David Markowitz
2024-02-27 04:14:36 -08:00
parent 124f6dad2a 424d54b98c
commit ae891aa4c3
264 changed files with 1945 additions and 1948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dMasterServer/InstanceManager.cpp
View File

@@ -181,7 +181,7 @@ void InstanceManager::RequestAffirmation(Instance* instance, const PendingInstan
bitStream.Write(request.id);
Game::server->Send(&bitStream, instance->GetSysAddr(), false);
Game::server->Send(bitStream, instance->GetSysAddr(), false);
LOG("Sent affirmation request %llu to %i/%i", request.id,
static_cast<int>(instance->GetZoneID().GetMapID()),
@@ -361,7 +361,7 @@ void Instance::Shutdown() {
BitStreamUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::SHUTDOWN);
Game::server->Send(&bitStream, this->m_SysAddr, false);
Game::server->Send(bitStream, this->m_SysAddr, false);
LOG("Triggered world shutdown for zone/clone/instance %i/%i/%i", GetMapID(), GetCloneID(), GetInstanceID());
}

4
dMasterServer/MasterServer.cpp
View File

@@ -577,7 +577,7 @@ void HandlePacket(Packet* packet) {
BitStreamUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::SESSION_KEY_RESPONSE);
bitStream.Write(key.first);
bitStream.Write(username);
Game::server->Send(&bitStream, packet->systemAddress, false);
Game::server->Send(bitStream, packet->systemAddress, false);
break;
}
}
@@ -787,7 +787,7 @@ int ShutdownSequence(int32_t signal) {
{
CBITSTREAM;
BitStreamUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::SHUTDOWN);
Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
Game::server->Send(bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
LOG("Triggered master shutdown");
}