10 files changed, 26 insertions, 12 deletions
diff --git a/world/map/npc/014-1/wedding-officiator.txt b/world/map/npc/014-1/wedding-officiator.txt
index dfdab00b..bc759cdf 100644
--- a/world/map/npc/014-1/wedding-officiator.txt
+++ b/world/map/npc/014-1/wedding-officiator.txt
@@ -135,7 +135,7 @@ L_too_poor:
 
 L_main_married:
     mes "[Wedding Officiator]";
-    mes "\"I hope that you and "+ strcharinfo(0, get(BL_ID, PARTNER)) +" are doing well?\"";
+    mes "\"I hope that you and your partner are doing well?\"";
     next;
     menu
         "We are very happy, thanks for asking!", L_farewell,
diff --git a/world/map/npc/magic/level1-summon-maggots.txt b/world/map/npc/magic/level1-summon-maggots.txt
index 49022635..28e99a87 100644
--- a/world/map/npc/magic/level1-summon-maggots.txt
+++ b/world/map/npc/magic/level1-summon-maggots.txt
@@ -27,6 +27,8 @@ OnCast:
     end;
 
 OnSummon:
+    if(get(Hp, .master) < 1) destroy; // destroy if master is missing
+    if(getmap(.master) != strnpcinfo(3)) destroy; // destroy if master left the map
     specialeffect FX_PENTAGRAM_BURST;
     set .@i, 0;
     set .@x, getnpcx();
@@ -42,7 +44,7 @@ S_SummonAll:
     summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1002, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
-    return;
+    destroy;
 
 OnInit:
     set .school, SKILL_MAGIC_ASTRAL;
diff --git a/world/map/npc/magic/level2-arrow-hail.txt b/world/map/npc/magic/level2-arrow-hail.txt
index 35cd584e..6e317232 100644
--- a/world/map/npc/magic/level2-arrow-hail.txt
+++ b/world/map/npc/magic/level2-arrow-hail.txt
@@ -66,7 +66,7 @@ OnNearbyNpc:
     end;
 
 OnLaunch:
-    if(get(BL_ID, .caster) != .caster) destroy; // destroy if caster is missing
+    if(get(Hp, .caster) < 1) destroy; // destroy if caster is missing
     if(getmap(.caster) != strnpcinfo(3)) destroy; // destroy if caster left the map
     set .hit, .hit + 1;
     if(.hit > .max_hit) destroy;
@@ -93,7 +93,7 @@ OnTimer30000:
     destroy;
 
 OnHit:
-    if(get(BL_ID, .caster) != .caster) destroy; // destroy if caster is missing
+    if(get(Hp, .caster) < 1) destroy; // destroy if caster is missing
     if(getmap(.caster) != strnpcinfo(3)) destroy; // destroy if caster left the map
 
     if(target(.caster, @target_id, 16) != 16 && .caster != @target_id) end;
diff --git a/world/map/npc/magic/level2-rain.txt b/world/map/npc/magic/level2-rain.txt
index 9e62782d..c088acf4 100644
--- a/world/map/npc/magic/level2-rain.txt
+++ b/world/map/npc/magic/level2-rain.txt
@@ -64,7 +64,7 @@ L_Tree:
     close;
 
 OnLaunch:
-    if(get(BL_ID, .caster) != .caster) destroy; // destroy if caster is missing
+    if(get(Hp, .caster) < 1) destroy; // destroy if caster is missing
     if(getmap(.caster) != strnpcinfo(3)) destroy; // destroy if caster left the map
     set .count, .count + 1;
     if(.count > .max) destroy;
@@ -82,7 +82,7 @@ S_Launch:
     return;
 
 OnHit:
-    if(get(BL_ID, .caster) != .caster) destroy; // destroy if caster is missing
+    if(get(Hp, .caster) < 1) destroy; // destroy if caster is missing
     if(getmap(.caster) != strnpcinfo(3)) destroy; // destroy if caster left the map
     if(target(.caster, @target_id, 16) != 16 && .caster != @target_id) end;
     if((get(BL_TYPE, @target_id) & 1) == 0) end; // either mob or pc
diff --git a/world/map/npc/magic/level2-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt
index 2ca630ed..f4d60475 100644
--- a/world/map/npc/magic/level2-summon-fluffies.txt
+++ b/world/map/npc/magic/level2-summon-fluffies.txt
@@ -28,6 +28,8 @@ OnCast:
     end;
 
 OnSummon:
+    if(get(Hp, .master) < 1) destroy; // destroy if master is missing
+    if(getmap(.master) != strnpcinfo(3)) destroy; // destroy if master left the map
     specialeffect FX_PENTAGRAM_BURST;
     set .@i, 0;
     set .@x, getnpcx();
@@ -43,7 +45,7 @@ S_SummonAll:
     summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1020, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
-    return;
+    destroy;
 
 OnInit:
     set .school, SKILL_MAGIC_ASTRAL;
diff --git a/world/map/npc/magic/level2-summon-mouboo.txt b/world/map/npc/magic/level2-summon-mouboo.txt
index f6a68fcf..b098a3dd 100644
--- a/world/map/npc/magic/level2-summon-mouboo.txt
+++ b/world/map/npc/magic/level2-summon-mouboo.txt
@@ -28,6 +28,8 @@ OnCast:
     end;
 
 OnSummon:
+    if(get(Hp, .master) < 1) destroy; // destroy if master is missing
+    if(getmap(.master) != strnpcinfo(3)) destroy; // destroy if master left the map
     specialeffect FX_PENTAGRAM_BURST;
     set .@i, 0;
     set .@x, getnpcx();
@@ -43,7 +45,7 @@ S_SummonAll:
     summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1028, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
-    return;
+    destroy;
 
 OnInit:
     set .school, SKILL_MAGIC_ASTRAL;
diff --git a/world/map/npc/magic/level2-summon-pinkie.txt b/world/map/npc/magic/level2-summon-pinkie.txt
index 785c8364..059d16f6 100644
--- a/world/map/npc/magic/level2-summon-pinkie.txt
+++ b/world/map/npc/magic/level2-summon-pinkie.txt
@@ -28,6 +28,8 @@ OnCast:
     end;
 
 OnSummon:
+    if(get(Hp, .master) < 1) destroy; // destroy if master is missing
+    if(getmap(.master) != strnpcinfo(3)) destroy; // destroy if master left the map
     specialeffect FX_PENTAGRAM_BURST;
     set .@i, 0;
     set .@x, getnpcx();
@@ -43,7 +45,7 @@ S_SummonAll:
     summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1018, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
-    return;
+    destroy;
 
 OnInit:
     set .school, SKILL_MAGIC_ASTRAL;
diff --git a/world/map/npc/magic/level2-summon-snakes.txt b/world/map/npc/magic/level2-summon-snakes.txt
index 2c46f28b..a9d0dbfe 100644
--- a/world/map/npc/magic/level2-summon-snakes.txt
+++ b/world/map/npc/magic/level2-summon-snakes.txt
@@ -29,6 +29,8 @@ OnCast:
     end;
 
 OnSummon:
+    if(get(Hp, .master) < 1) destroy; // destroy if master is missing
+    if(getmap(.master) != strnpcinfo(3)) destroy; // destroy if master left the map
     specialeffect FX_PENTAGRAM_BURST;
     set .@i, 0;
     set .@x, getnpcx();
@@ -44,7 +46,7 @@ S_SummonAll:
     summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1010, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
-    return;
+    destroy;
 
 OnInit:
     set .school, SKILL_MAGIC_DARK;
diff --git a/world/map/npc/magic/level2-summon-spiky-mushroom.txt b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
index 5659fc32..188e9b9f 100644
--- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt
+++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
@@ -28,6 +28,8 @@ OnCast:
     end;
 
 OnSummon:
+    if(get(Hp, .master) < 1) destroy; // destroy if master is missing
+    if(getmap(.master) != strnpcinfo(3)) destroy; // destroy if master left the map
     specialeffect FX_PENTAGRAM_BURST;
     set .@i, 0;
     set .@x, getnpcx();
@@ -43,7 +45,7 @@ S_SummonAll:
     summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1019, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
-    return;
+    destroy;
 
 OnInit:
     set .school, SKILL_MAGIC_ASTRAL;
diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt
index 02442c6b..3b8b9cfc 100644
--- a/world/map/npc/magic/level2-summon-wickedmushroom.txt
+++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt
@@ -29,6 +29,8 @@ OnCast:
     end;
 
 OnSummon:
+    if(get(Hp, .master) < 1) destroy; // destroy if master is missing
+    if(getmap(.master) != strnpcinfo(3)) destroy; // destroy if master left the map
     specialeffect FX_PENTAGRAM_BURST;
     set .@i, 0;
     set .@x, getnpcx();
@@ -44,7 +46,7 @@ S_SummonAll:
     summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1106, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
-    return;
+    destroy;
 
 OnInit:
     set .school, SKILL_MAGIC_DARK;