From b9be7649ea62189bcae67fa94babc438852b9777 Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Wed, 28 Aug 2019 17:48:49 +0000
Subject: Revert the changes from the last 2 releases

battle.cpp is very messy and full of bugs
---
 src/map/skill.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 05399c2..d9a7717 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -532,7 +532,7 @@ int skill_castend_nodamage_id(dumb_ptr<block_list> src, dumb_ptr<block_list> bl,
     switch (skillid)
     {
         case SkillID::NPC_SUMMONSLAVE:
-            if (md)
+            if (md && !md->master_id)
             {
                 mob_summonslave(md,
                         md->skillidx->val,
@@ -542,10 +542,7 @@ int skill_castend_nodamage_id(dumb_ptr<block_list> src, dumb_ptr<block_list> bl,
             break;
 
         case SkillID::NPC_EMOTION:
-            if (dstsd)
-                clif_emotion(dstsd,
-                        md->skillidx->val[0]);
-            else if (md)
+            if (md)
                 clif_emotion(md,
                         md->skillidx->val[0]);
             break;
-- 
cgit v1.2.3-70-g09d2