Ticket #3257: capturing_alert.2.patch

binaries/data/mods/public/simulation/components/Armour.js

@@ -49 +49 @@
  */
 Armour.prototype.TakeDamage = function(hack, pierce, crush, source)
 {
-    // Alert target owner of attack
-    var cmpAttackDetection = QueryOwnerInterface(this.entity, IID_AttackDetection);
-    if (cmpAttackDetection)
-    {
-        var now = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer).GetTime();
-        if (now > this.nextAlertTime)
-        {
-            this.nextAlertTime = now + cmpAttackDetection.GetSuppressionTime();
-            cmpAttackDetection.AttackAlert(this.entity, source);
-        }
-    }
-
     if (this.invulnerable) 
         return { "killed": false, "change": 0 };
 

binaries/data/mods/public/simulation/components/AttackDetection.js

@@ -45 +45 @@
 {
     var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
     var cmpOwnership = Engine.QueryInterface(msg.target, IID_Ownership);
-    if (cmpOwnership.GetOwner() == cmpPlayer.GetPlayerID())
-        Engine.PostMessage(msg.target, MT_MinimapPing);
+    if (cmpOwnership.GetOwner() != cmpPlayer.GetPlayerID())
+        return;
+    Engine.PostMessage(msg.target, MT_MinimapPing);
+
+    // Alert target owner of attack
+    this.AttackAlert(msg.target, msg.attacker);
 };
 
 //// External interface ////