Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-11-30 13:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix other script calls

Browse Source
This commit is contained in:
Aaron Kimbre
2023-06-13 22:01:51 -05:00
parent 31be1fbe4c
commit fdd98ab825
10 changed files with 52 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dGame/dComponents/DestroyableComponent.cpp
View File

@@ -822,16 +822,12 @@ void DestroyableComponent::Smash(const LWOOBJID source, const eKillType killType
}
Entity* zoneControl = EntityManager::Instance()->GetZoneControlEntity();
for (CppScripts::Script* script : CppScripts::GetEntityScripts(zoneControl)) {
script->OnPlayerDied(zoneControl, m_ParentEntity);
}
zoneControl->GetScript()->OnPlayerDied(zoneControl, m_ParentEntity);
std::vector<Entity*> scriptedActs = EntityManager::Instance()->GetEntitiesByComponent(eReplicaComponentType::SCRIPTED_ACTIVITY);
for (Entity* scriptEntity : scriptedActs) {
if (scriptEntity->GetObjectID() != zoneControl->GetObjectID()) { // Don't want to trigger twice on instance worlds
for (CppScripts::Script* script : CppScripts::GetEntityScripts(scriptEntity)) {
script->OnPlayerDied(scriptEntity, m_ParentEntity);
}
scriptEntity->GetScript()->OnPlayerDied(scriptEntity, m_ParentEntity);
}
}
}