- Added a temporary band-aid to prevent executing the script of non-arrows when they are equipped on the arrow-slot (until the actual cause of why pc_unequipitem is not working correctly is discovered/fixed)

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

Changelog-Trunk.txt

@@ -3,6 +3,10 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/07/07
+	* Added a temporary band-aid to prevent executing the script of non-arrows
+	  when they are equipped on the arrow-slot (until the actual cause of why
+	  pc_unequipitem is not working correctly is discovered/fixed) [Skotlex]
 2006/07/06
 	* Modified the party_data structure on the map server to remove some
 	  redundant data. Added a party_data structure on the char-server to hold a

src/map/status.c

@@ -1694,7 +1694,9 @@ int status_calc_pc(struct map_session_data* sd,int first)
 
 	if(sd->equip_index[EQI_AMMO] >= 0){ // –î
 		index = sd->equip_index[EQI_AMMO];
-		if(sd->inventory_data[index]){		// Arrows
+		//FIXME: The equip check is a temporary measure until a speed exploit
+		// that has yet to be fixed!
+		if(sd->inventory_data[index] && sd->status.inventory[index].equip&EQP_AMMO){		// Arrows
 			sd->state.lr_flag = 2;
 			run_script(sd->inventory_data[index]->script,0,sd->bl.id,0);
 			sd->state.lr_flag = 0;