- Fixed # commands not being blocked when muted if the mute config settings say you should be.

- Moved skill db reading before loading mobs so that the new mob condition checks work.
- Cleaned up the warning/errors of the mob skill reading function. They are now warnings if the skill is read anyway (default conditions are used) and an error when the skill is not loaded.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10075 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 2 deletions

diff --git a/src/map/map.c b/src/map/map.c
index f16282bf4..e2815ecdd 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3316,13 +3316,13 @@ int do_init(int argc, char *argv[]) {
 	do_init_clif();
 	do_init_script();
 	do_init_itemdb();
-	do_init_mob();	// npcの初期化・でmob_spawnして、mob_dbを?照するのでinit_npcより先
+	do_init_skill();
+	do_init_mob();
 	do_init_pc();
 	do_init_status();
 	do_init_party();
 	do_init_guild();
 	do_init_storage();
-	do_init_skill();
 	do_init_pet();
 	do_init_merc();	//[orn]
 	do_init_npc();