[Fixed]

- Battle mechanics in battle_check_target

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6836 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,6 +4,8 @@ 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/29
+	* [Fixed]:
+	  - Battle mechanics in battle_check_target [Lance]
 	* [Fixed]:
 	  - Typo in mob_dead causing crash. Thanks to reddozen and his gang for testing.
 	    [Lance]

src/map/battle.c

@@ -3124,11 +3124,11 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 		case BL_MOB:
 		{
 			TBL_MOB*md = (TBL_MOB*)s_bl;
-			if(md->state.killer) // Is on a rampage too :D
-				state |= BCT_ENEMY;
 			if (!agit_flag && md->guardian_data && md->guardian_data->guild_id)
 				return 0; //Disable guardians/emperium owned by Guilds on non-woe times.
-			if (!md->special_state.ai) { //Normal mobs.
+			if(md->state.killer) // Is on a rampage too :D
+				state |= BCT_ENEMY;
+			else if (!md->special_state.ai) { //Normal mobs.
 				if (t_bl->type == BL_MOB && !((TBL_MOB*)t_bl)->special_state.ai)
 					state |= BCT_PARTY; //Normal mobs with no ai are friends.
 				else