LEGO_Universe/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer synced 2024-08-30 18:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address feedback

Browse Source
This commit is contained in:
Aaron Kimbre 2023-05-11 09:23:48 -05:00
parent 5af5b0f1c1
commit a809f36548
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dGame/dGameMessages/GameMessages.cpp
View File

@ -6215,8 +6215,5 @@ void GameMessages::HandleRequestActivityExit(RakNet::BitStream* inStream, Entity
inStream->Read(player_id);
auto player = EntityManager::Instance()->GetEntity(player_id);
if (!entity || !player) return;
for (auto* shootingGallery : EntityManager::Instance()->GetEntitiesByComponent(eReplicaComponentType::SHOOTING_GALLERY)) {
shootingGallery->RequestActivityExit(entity, player_id, true);
}
entity->RequestActivityExit(entity, player_id, canceled);
}

2
dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.h
View File

@ -67,7 +67,7 @@ public:
void OnMessageBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData) override;
void OnActivityTimerDone(Entity* self, const std::string& name) override;
void OnActivityTimerUpdate(Entity* self, const std::string& name, float_t timeRemaining, float_t elapsedTime) override;
void OnRequestActivityExit(Entity* self, LWOOBJID player, bool canceled);
void OnRequestActivityExit(Entity* self, LWOOBJID player, bool canceled) override;
private:
static std::vector<std::vector<SGEnemy>> GetWaves();
static SGConstants GetConstants();