projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-01 16:12:53 -04:00
Code Issues Projects Releases Wiki Activity

Merged in M4SS/holocore/bugfix/location_aoe (pull request #549)

Browse Source 
Prevent location AoE from throwing exceptions
This commit is contained in:
Mads Boddum
2018-02-24 04:56:20 +00:00
committed by Josh Larson
parent a63f073cc3 2aec0af6d4
commit ca2cd3f791
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/services/combat/CombatManager.java
+8 -2
View File
@@ -204,8 +204,14 @@ public class CombatManager extends Manager {
doCombatArea(source, source, info, weapon, command, false);
break;
case TARGET_AREA:
doCombatArea(source, delayEgg != null ? delayEgg : target, info, weapon, command, true);
break; // Same as AREA, but the target is the destination for the AoE and can take damage
if (target != null) {
// Same as AREA, but the target is the destination for the AoE and can take damage
doCombatArea(source, delayEgg != null ? delayEgg : target, info, weapon, command, true);
} else {
// TODO AoE based on Location instead of delay egg
}
break;
default:
break;
}