2 files changed, 5 insertions, 7 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 870a94390..72b71b8f9 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2838,7 +2838,7 @@ int do_final_npc(void)
 	return 0;

 }

 

-/*static void npc_debug_warps_sub(struct npc_data *nd)

+static void npc_debug_warps_sub(struct npc_data *nd)

 {

 	int m;

 	if (nd->bl.type != BL_NPC || nd->bl.subtype != WARP || nd->bl.m < 0)

@@ -2869,7 +2869,7 @@ static void npc_debug_warps(void)
 	for (m = 0; m < map_num; m++)

 		for (i = 0; i < map[m].npc_num; i++)

 			npc_debug_warps_sub(map[m].npc[i]);

-}*/

+}

 

 /*==========================================

  * npcŹ‰Šú‰»

diff --git a/src/map/status.c b/src/map/status.c
index f5130d13e..95d001008 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1161,11 +1161,9 @@ int status_calc_mob(struct mob_data* md, int first)
 		status->flee2 = 0;
 
 	//Initial battle status
-	if (!first) {
-		status_cpy(&md->status, status);
-		if (md->sc.count)
-			status_calc_bl(&md->bl, SCB_ALL);
-	} else
+	if (!first)
+		status_calc_bl(&md->bl, SCB_ALL);
+	else
 		memcpy(&md->status, status, sizeof(struct status_data));
 	return 1;
 }