summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/pc.c5
-rw-r--r--src/map/script.c1
3 files changed, 8 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9599749e6..9adb358f7 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ 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.
+09/06/05
+ * Job_Battle_Manual and Battle_Manual can be used simultaneously. [Inkfish]
+ * Fixed "sleep" after "attachrid" (a different rid) halts the script. [Inkfish]
09/06/04
* Fixed turning off a skill needed to meet the requirements. [Inkfish]
* Skills used through items which don't have aftercast delay or cast time now don't overwrite the former canact_tick. [Inkfish]
diff --git a/src/map/pc.c b/src/map/pc.c
index b1e558bc3..01e683ea0 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3406,10 +3406,13 @@ int pc_isUseitem(struct map_session_data *sd,int n)
case 14532: // Battle_Manual25
case 14533: // Battle_Manual100
case 14545: // Battle_Manual300
- case 14592: // JOB_Battle_Manual
if( sd->sc.data[SC_EXPBOOST] )
return 0;
break;
+ case 14592: // JOB_Battle_Manual
+ if( sd->sc.data[SC_JEXPBOOST] )
+ return 0;
+ break;
// Mercenary Items
diff --git a/src/map/script.c b/src/map/script.c
index b5e00fe55..913682c89 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3203,6 +3203,7 @@ void run_script_main(struct script_state *st)
if(st->sleep.tick > 0) {
//Delay execution
+ sd = map_id2sd(st->rid); // Refresh sd since script might have attached someone while running. [Inkfish]
st->sleep.charid = sd?sd->status.char_id:0;
st->sleep.timer = add_timer(gettick()+st->sleep.tick,
run_script_timer, st->sleep.charid, (intptr)st);