fix another crash

9 files changed, 11 insertions, 0 deletions

diff --git a/world/map/npc/magic/level1-summon-maggots.txt b/world/map/npc/magic/level1-summon-maggots.txt
index 28e99a87..89811abf 100644
--- a/world/map/npc/magic/level1-summon-maggots.txt
+++ b/world/map/npc/magic/level1-summon-maggots.txt
@@ -27,6 +27,7 @@ OnCast:
     end;
 
 OnSummon:
+    if (!isloggedin(.master)) destroy;
     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;
diff --git a/world/map/npc/magic/level2-arrow-hail.txt b/world/map/npc/magic/level2-arrow-hail.txt
index 6e317232..928c40b7 100644
--- a/world/map/npc/magic/level2-arrow-hail.txt
+++ b/world/map/npc/magic/level2-arrow-hail.txt
@@ -66,6 +66,7 @@ OnNearbyNpc:
     end;
 
 OnLaunch:
+    if (!isloggedin(.caster)) destroy;
     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;
@@ -93,6 +94,7 @@ OnTimer30000:
     destroy;
 
 OnHit:
+    if (!isloggedin(.caster)) destroy;
     if(get(Hp, .caster) < 1) destroy; // destroy if caster is missing
     if(getmap(.caster) != strnpcinfo(3)) destroy; // destroy if caster left the map
 
diff --git a/world/map/npc/magic/level2-rain.txt b/world/map/npc/magic/level2-rain.txt
index c088acf4..bf13a628 100644
--- a/world/map/npc/magic/level2-rain.txt
+++ b/world/map/npc/magic/level2-rain.txt
@@ -64,6 +64,7 @@ L_Tree:
     close;
 
 OnLaunch:
+    if (!isloggedin(.caster)) destroy;
     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;
@@ -82,6 +83,7 @@ S_Launch:
     return;
 
 OnHit:
+    if (!isloggedin(.caster)) destroy;
     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-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt
index f4d60475..f5338e71 100644
--- a/world/map/npc/magic/level2-summon-fluffies.txt
+++ b/world/map/npc/magic/level2-summon-fluffies.txt
@@ -28,6 +28,7 @@ OnCast:
     end;
 
 OnSummon:
+    if (!isloggedin(.master)) destroy;
     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;
diff --git a/world/map/npc/magic/level2-summon-mouboo.txt b/world/map/npc/magic/level2-summon-mouboo.txt
index b098a3dd..e5e1833a 100644
--- a/world/map/npc/magic/level2-summon-mouboo.txt
+++ b/world/map/npc/magic/level2-summon-mouboo.txt
@@ -28,6 +28,7 @@ OnCast:
     end;
 
 OnSummon:
+    if (!isloggedin(.master)) destroy;
     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;
diff --git a/world/map/npc/magic/level2-summon-pinkie.txt b/world/map/npc/magic/level2-summon-pinkie.txt
index 059d16f6..35d640e4 100644
--- a/world/map/npc/magic/level2-summon-pinkie.txt
+++ b/world/map/npc/magic/level2-summon-pinkie.txt
@@ -28,6 +28,7 @@ OnCast:
     end;
 
 OnSummon:
+    if (!isloggedin(.master)) destroy;
     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;
diff --git a/world/map/npc/magic/level2-summon-snakes.txt b/world/map/npc/magic/level2-summon-snakes.txt
index a9d0dbfe..f1cb2cf4 100644
--- a/world/map/npc/magic/level2-summon-snakes.txt
+++ b/world/map/npc/magic/level2-summon-snakes.txt
@@ -29,6 +29,7 @@ OnCast:
     end;
 
 OnSummon:
+    if (!isloggedin(.master)) destroy;
     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;
diff --git a/world/map/npc/magic/level2-summon-spiky-mushroom.txt b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
index 188e9b9f..1dcb287f 100644
--- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt
+++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
@@ -28,6 +28,7 @@ OnCast:
     end;
 
 OnSummon:
+    if (!isloggedin(.master)) destroy;
     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;
diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt
index 3b8b9cfc..280303a4 100644
--- a/world/map/npc/magic/level2-summon-wickedmushroom.txt
+++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt
@@ -29,6 +29,7 @@ OnCast:
     end;
 
 OnSummon:
+    if (!isloggedin(.master)) destroy;
     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;