summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog.txt2
-rw-r--r--src/map/mob.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 869344cfa..55d5e9c5c 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
12/9
+ * Moved a map_freeblock_unlock() around to eliminate a
+ crash [MouseJstr]
* Fixed how players are cleaned up when they disconnected
during authentication [MouseJstr]
* Adjusted some messages in @marry [MouseJstr]
diff --git a/src/map/mob.c b/src/map/mob.c
index 12c69537a..bf8cbe293 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -764,9 +764,11 @@ static int mob_timer(int tid,unsigned int tick,int id,int data)
printf("mob_timer : %d ?\n",md->state.state);
break;
}
- map_freeblock_unlock();
+
if (md->timer == -1)
mob_changestate(md,MS_WALK,0);
+
+ map_freeblock_unlock();
return 0;
}