summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-10-11 04:30:26 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-10-11 04:30:26 +0000
commit8938559e752595bf98d353c9901a0120cf945654 (patch)
tree5817391463d0b7ab07d3d25fecd7b3667dca4a70 /src
parent3b8cf07792244242cbd9788d95ec5cddd6b43a33 (diff)
downloadhercules-8938559e752595bf98d353c9901a0120cf945654.tar.gz
hercules-8938559e752595bf98d353c9901a0120cf945654.tar.bz2
hercules-8938559e752595bf98d353c9901a0120cf945654.tar.xz
hercules-8938559e752595bf98d353c9901a0120cf945654.zip
Applied ultramage's fix to prevent a segfault when a mob dead event triggered by a land-based skill causes the player to warp. (bugreport:4426)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14425 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 6a7f94e1e..b3dd475a1 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -9902,6 +9902,9 @@ static int skill_trap_splash (struct block_list *bl, va_list ap)
unit = (struct skill_unit *)src;
tick = va_arg(ap,int);
+ if( !unit->alive || bl->prev == NULL )
+ return 0;
+
nullpo_ret(sg = unit->group);
nullpo_ret(ss = map_id2bl(sg->src_id));