summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c
index fdd7c9f74..f542ff04a 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4261,6 +4261,9 @@ BUILDIN_FUNC(warpparty)
if( str2 && strcmp(str2, map[pl_sd->bl.m].name) != 0 )
continue;
+ if( pc_isdead(pl_sd) )
+ continue;
+
switch( type )
{
case 0: // Random
@@ -4293,7 +4296,7 @@ BUILDIN_FUNC(warpparty)
}
break;
case 4: // m,x,y
- if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp)
+ if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp)
pc_setpos(pl_sd,mapindex_name2id(str),x,y,3);
break;
}