summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorgreenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-21 16:10:13 +0000
committergreenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-21 16:10:13 +0000
commitd40848e2dd9e69d1f74bf01de714aa22f0731a81 (patch)
tree5cf62d99b8780cc1d92238e2016cee316de87ba0 /src/map
parent31ad1a39db0aa488dd5a96e54d842b89a46eb129 (diff)
downloadhercules-d40848e2dd9e69d1f74bf01de714aa22f0731a81.tar.gz
hercules-d40848e2dd9e69d1f74bf01de714aa22f0731a81.tar.bz2
hercules-d40848e2dd9e69d1f74bf01de714aa22f0731a81.tar.xz
hercules-d40848e2dd9e69d1f74bf01de714aa22f0731a81.zip
Follow up r16327 missing null pointer check on mercenary data.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16328 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/unit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index e85849283..319b2a40d 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -194,7 +194,7 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data
unit_warp( &sd->md->bl, sd->bl.m, sd->bl.x, sd->bl.y, CLR_TELEPORT );
}
}
- else
+ else if( sd->md )
{
// reset the tick, he is not far anymore
sd->md->masterteleport_timer = 0;