swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-04 19:13:06 -04:00
Code Issues Projects Releases Wiki Activity

more fixing and cleanup

Browse Source
This commit is contained in:
DarthArgus
2015-10-13 20:49:42 -05:00
parent 0775701e48
commit b61c932498
10 changed files with 13 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/object/ServerObject.cpp
+5 -3
View File
@@ -4156,11 +4156,13 @@ void ServerObject::performCombatSpam (const MessageQueueCombatSpam & spamMsg, bo
if (sendToTarget && !sendToBystanders)
{
ServerObject * const target = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(spamMsg.m_defender));
if (target)
if (target->getNetworkId() != spamMsg.m_attacker)
if (target) {
if (target->getNetworkId() != spamMsg.m_attacker) {
target->seeCombatSpam (spamMsg);
else
}
} else {
WARNING_STRICT_FATAL (!sendToSelf && !sendToBystanders, ("null target_obj in commandFuncCombatSpam, when sendToTarget was set true"));
}
}
if (sendToBystanders)