pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added proper support for arena in nats_manager, misc cleanup

Browse Source
This commit is contained in:
Xackery
2018-03-12 10:00:00 -07:00
parent c9a79af79b
commit 40ef387496
8 changed files with 636 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/nats_manager.cpp
+459 -349
View File
File diff suppressed because it is too large Load Diff
zone/nats_manager.h
+3 -2
View File
@@ -16,7 +16,7 @@ public:
~NatsManager();
void Process();
void Unregister();
void ZoneSubscribe(const char * zonename);
void ZoneSubscribe(const char * zonename, uint32 instance);
void Load();
void OnChannelMessageEvent(uint32 entity_id, ChannelMessage_Struct * cm);
void OnEntityEvent(const EmuOpcode op, uint32 entity_id, uint32 target_id);
@@ -37,7 +37,8 @@ protected:
natsConnection *conn = NULL;
natsStatus s;
natsOptions *opts = NULL;
std::string subscribedZonename;
std::string subscribedZoneName;
uint32 subscribedZoneInstance;
natsSubscription *zoneChannelMessageSub = NULL;
natsSubscription *zoneCommandMessageSub = NULL;
natsSubscription *zoneEntityEventSubscribeAllSub = NULL;
zone/net.cpp
+1 -1
View File
@@ -515,7 +515,7 @@ int main(int argc, char** argv) {
entity_list.BeaconProcess();
entity_list.EncounterProcess();
if (zone->IsLoaded()) {
nats.ZoneSubscribe(zone->GetShortName());
nats.ZoneSubscribe(zone->GetShortName(), zone->GetInstanceID());
nats.Process();
}
if (zone) {