Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-05 18:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Area of Affect Behaviors targeting incorrect entities

Browse Source
This commit is contained in:
Jacob Hofer
2022-01-02 20:37:03 +00:00
parent 203e75ef3d
commit 1ddf7d1f94
6 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dGame/dComponents/DestroyableComponent.cpp
View File

@@ -498,7 +498,7 @@ Entity* DestroyableComponent::GetKiller() const
return EntityManager::Instance()->GetEntity(m_KillerID);
}
bool DestroyableComponent::CheckValidity(const LWOOBJID target, const bool ignoreFactions) const
bool DestroyableComponent::CheckValidity(const LWOOBJID target, const bool ignoreFactions, const bool targetEnemy, const bool targetFriend) const
{
auto* entity = EntityManager::Instance()->GetEntity(target);
@@ -537,15 +537,19 @@ bool DestroyableComponent::CheckValidity(const LWOOBJID target, const bool ignor
auto candidateList = destroyable->GetFactionIDs();
bool isEnemy = false;
for (auto value : candidateList)
{
if (std::find(enemyList.begin(), enemyList.end(), value) != enemyList.end())
{
return true;
isEnemy = true;
break;
}
}
return false;
return (isEnemy && targetEnemy) || (!isEnemy && targetFriend);
}

2
dGame/dComponents/DestroyableComponent.h
View File

@@ -371,7 +371,7 @@ public:
* @param ignoreFactions whether or not check for the factions, e.g. just return true if the entity cannot be smashed
* @return if the target ID is a valid enemy
*/
bool CheckValidity(LWOOBJID target, bool ignoreFactions = false) const;
bool CheckValidity(LWOOBJID target, bool ignoreFactions = false, bool targetEnemy = true, bool targetFriend = false) const;
/**
* Attempt to damage this entity, handles everything from health and armor to absorption, immunity and callbacks.