summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/status.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e27328a4b..ebf3bad06 100644
--- a/Changelog-Trunk.txt
+++ b/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
diff --git a/src/map/status.c b/src/map/status.c
index 09d6992b2..bce2fd246 100644
--- a/src/map/status.c
+++ b/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;