summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c5
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index e1c622462..66cb74141 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1342,10 +1342,11 @@ int atcommand_rura(
return -1;
}
- /*if ((x || y) && map_getcell(m, x, y, CELL_CHKNOPASS)) {
+ if ((x || y) && map_getcell(m, x, y, CELL_CHKNOPASS))
+ { //This is to prevent the pc_setpos call from printing an error.
clif_displaymessage(fd, msg_txt(2));
x = y = 0; //Invalid cell, use random spot.
- }*/
+ }
if (map[m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
clif_displaymessage(fd, msg_txt(247));
return -1;
diff --git a/src/map/skill.c b/src/map/skill.c
index 81788c88a..25063712a 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8481,7 +8481,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
return 0;
}
break;
- case ST_RECOV_WEIGHT_RATE://## what is this for and why can battle_config.natural_heal_weight_rate be 101? [FlavioJS]
+ case ST_RECOV_WEIGHT_RATE:
if(battle_config.natural_heal_weight_rate <= 100 && sd->weight*100/sd->max_weight >= battle_config.natural_heal_weight_rate) {
clif_skill_fail(sd,skill,0,0);
return 0;
diff --git a/src/map/status.c b/src/map/status.c
index a79ff7f89..5683a6218 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5247,9 +5247,9 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
break;
case SC_JOINTBEAT:
- val2 |= sc->data[SC_JOINTBEAT].val2; // stackable ailments
if( val2&BREAK_NECK )
sc_start(bl,SC_BLEEDING,100,val1,skill_get_time2(StatusSkillChangeTable[type],val1));
+ val2 |= sc->data[SC_JOINTBEAT].val2; // stackable ailments
break;
case SC_BERSERK: