summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c4158ea33..8f27b40f2 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.
+2008/01/04
+ * Fixed Music Lesson's effect on Assassin Cross of Sunset.
+ * Fixed a possible crash in status_change_timer when debug mode is
+ disabled. [Skotlex]
2008/01/03
* Changes to reduce the number of map cell types
- Pneuma now again works via status change (see r3969)
diff --git a/src/map/skill.c b/src/map/skill.c
index 92c58809e..692a94e23 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6271,7 +6271,7 @@ struct skill_unit_group* skill_unitsetting (struct block_list *src, short skilli
case BA_ASSASSINCROSS:
val1 = 100+10*skilllv+status->agi; // ASPD increase
if(sd)
- val1 += pc_checkskill(sd,BA_MUSICALLESSON);
+ val1 += 5*pc_checkskill(sd,BA_MUSICALLESSON);
break;
case DC_FORTUNEKISS:
val1 = 10+skilllv+(status->luk/10); // Critical increase
diff --git a/src/map/status.c b/src/map/status.c
index 85c17215d..c4cca766a 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6662,7 +6662,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
struct status_change_entry *sce;
bl = map_id2bl(id);
- sc = status_get_sc(bl);
+ sc = bl?status_get_sc(bl):NULL;
status = status_get_status_data(bl);
if(!(bl && sc && (sce = sc->data[type])))