From 2a581450a6ff87c5a183be3855e68b3f2e1b53f3 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Thu, 24 Mar 2016 15:10:40 -0400
Subject: improvements, cleanup, bug fixes

---
 src/map/mob.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/map/mob.cpp')

diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index 1be40f0..0da946a 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -2701,7 +2701,6 @@ int mob_damage(dumb_ptr<block_list> src, dumb_ptr<mob_data> md, int damage,
     }                           // [MouseJstr]
 
     // SCRIPT実行
-    if (md->npc_event)
     {
         if (sd == nullptr)
         {
@@ -2711,7 +2710,17 @@ int mob_damage(dumb_ptr<block_list> src, dumb_ptr<mob_data> md, int damage,
             }
         }
         if (sd)
-            npc_event(sd, md->npc_event, 0);
+        {
+            if (md->npc_event)
+                npc_event(sd, md->npc_event, 0);
+
+            // TODO: in the future, OnPCKillEvent, OnMobKillEvent and OnPCDieEvent should be combined
+            argrec_t arg[1] =
+            {
+                {"@mobID"_s, static_cast<int32_t>(unwrap<Species>(md->mob_class))},
+            };
+            npc_event_doall_l(stringish<ScriptLabel>("OnMobKillEvent"_s), sd->bl_id, arg);
+        }
     }
 
     clif_clearchar(md, BeingRemoveWhy::DEAD);
-- 
cgit v1.2.3-60-g2f50