projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-01 02:16:15 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Ziggeh
2014-04-19 15:15:21 +02:00
parent a65c3d6966 ed78dd459b
commit 9b6127402d
203 changed files with 2861 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+6
View File
@@ -41,6 +41,7 @@ import protocol.swg.objectControllerObjects.CombatSpam;
import protocol.swg.objectControllerObjects.CommandEnqueueRemove;
import protocol.swg.objectControllerObjects.StartTask;
import resources.common.FileUtilities;
import resources.datatables.Options;
import resources.datatables.Elemental;
import resources.datatables.Posture;
import resources.datatables.WeaponType;
@@ -282,6 +283,11 @@ public class CombatService implements INetworkDispatch {
private void applyDamage(CreatureObject attacker, TangibleObject target, int damage) {
target.setConditionDamage(target.getConditionDamage() + damage);
if (target.getOption(Options.MOUNT)) {
core.mountService.damage((CreatureObject) target);
}
DamageTaken event = events.new DamageTaken();
event.attacker = attacker;
event.damage = damage;