summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-26 23:36:36 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-26 23:36:36 +0000
commit40ca2d562ca42e5030349975cde15a9dd30b3771 (patch)
treee0dd895f0f7537a538c7c618f83742aaf898c054
parent54eaa29a73965fd3383057063801deec6fbb640e (diff)
downloadhercules-40ca2d562ca42e5030349975cde15a9dd30b3771.tar.gz
hercules-40ca2d562ca42e5030349975cde15a9dd30b3771.tar.bz2
hercules-40ca2d562ca42e5030349975cde15a9dd30b3771.tar.xz
hercules-40ca2d562ca42e5030349975cde15a9dd30b3771.zip
* Fixed crashing in mob.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6782 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/mob.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 094897db1..73eb85049 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/26
+ * Fixed crashing in mob.c [Lance]
* Patches to allow everything to work right. + 1 more sample script. [Lance]
* Mob control engine tested 99% working so far. [Lance]
* Change scripting engine's NPC scope vars to dot (.) style.
diff --git a/src/map/mob.c b/src/map/mob.c
index 1b148f629..1e2d7c14e 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2169,7 +2169,7 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type)
guild_agit_break(md);
}
- if(src->type == BL_MOB){
+ if(src && src->type == BL_MOB){
struct mob_data *smd = (struct mob_data *)src;
if(smd->nd){
setd_sub(NULL, NULL, ".ai_action", 0, (void *)(int)5, &smd->nd->u.scr.script->script_vars);