From 8cbba34e1615cde8e26c9e83cd072dba489a3235 Mon Sep 17 00:00:00 2001
From: valaris <valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 20 Nov 2004 16:55:07 +0000
Subject: [PATCH] * Fixed small/big monster spawning crashing (mixed up the
 merge). [Valaris]

git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@272 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog.txt | 1 +
 src/map/mob.c | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 4d1f5e6872..2daef642db 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
 Date	Added
 11/20
+	* Fixed small/big monster spawning crashing (mixed up the merge). [Valaris]
 	* Fixed crash with upgrading TXT and having more than 256 accounts. [Valaris]
 	* TXT upgrades will convert broken flag to attribute column. [Valaris]
 	* Prevent use of emotion packet to display red mute emote. [Valaris]
diff --git a/src/map/mob.c b/src/map/mob.c
index 6c1a62c65e..1f953b75df 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -156,10 +156,6 @@ int mob_once_spawn(struct map_session_data *sd,char *mapname,
 	for(count=0;count<amount;count++){
 		md=(struct mob_data *)aCalloc(1,sizeof(struct mob_data));
 		memset(md, '\0', sizeof *md);
-		if(mob_db[class].mode&0x02)
-			md->lootitem=(struct item *)aCalloc(LOOTITEM_SIZE,sizeof(struct item));
-		else
-			md->lootitem=NULL;
 
 		if(class>4000) { // large/tiny mobs [Valaris]
 			md->size=2;
@@ -170,6 +166,11 @@ int mob_once_spawn(struct map_session_data *sd,char *mapname,
 			class-=2000;
 		}
 
+		if(mob_db[class].mode&0x02)
+			md->lootitem=(struct item *)aCalloc(LOOTITEM_SIZE,sizeof(struct item));
+		else
+			md->lootitem=NULL;
+
 		mob_spawn_dataset(md,mobname,class);
 		md->bl.m=m;
 		md->bl.x=x;