summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/mob.c12
-rw-r--r--src/map/script.c3
-rw-r--r--src/map/skill.c8
4 files changed, 14 insertions, 13 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 4e4a701c5..8b1dbc0a2 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7634,6 +7634,10 @@ int clif_refresh(struct map_session_data *sd) {
clif_updatestatus(sd,SP_INT);
clif_updatestatus(sd,SP_DEX);
clif_updatestatus(sd,SP_LUK);
+ if (sd->spiritball)
+ clif_spiritball_single(sd->fd, sd);
+ if (sd->vd.cloth_color)
+ clif_refreshlook(&sd->bl,sd->bl.id,LOOK_CLOTHES_COLOR,sd->vd.cloth_color,SELF);
map_foreachinrange(clif_getareachar,&sd->bl,AREA_SIZE,BL_ALL,sd);
clif_weather_check(sd);
return 0;
diff --git a/src/map/mob.c b/src/map/mob.c
index e211faf2e..63bd76d91 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1790,12 +1790,18 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
}
}
- for(i=0,mvp_damage=0;i<DAMAGELOG_SIZE && md->dmglog[i].id;i++)
+ for(i=count=0,mvp_damage=0;i<DAMAGELOG_SIZE && md->dmglog[i].id;i++)
{
tmpsd[i] = map_charid2sd(md->dmglog[i].id);
if(tmpsd[i] == NULL)
continue;
- if(tmpsd[i]->bl.m != m || pc_isdead(tmpsd[i]))
+ if(tmpsd[i]->bl.m != m)
+ {
+ tmpsd[i] = NULL;
+ continue;
+ }
+ count++; //Only logged into same map chars are counted for the total.
+ if (pc_isdead(tmpsd[i]))
{
tmpsd[i] = NULL;
continue;
@@ -1805,7 +1811,6 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
tmpsd[i] = NULL;
continue;
}
-
if(mvp_damage<(unsigned int)md->dmglog[i].dmg){
third_sd = second_sd;
second_sd = mvp_sd;
@@ -1813,7 +1818,6 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
mvp_damage=md->dmglog[i].dmg;
}
}
- count = i; //Total number of attackers.
if(!battle_config.exp_calc_type && count > 1)
{ //Apply first-attacker 200% exp share bonus
diff --git a/src/map/script.c b/src/map/script.c
index 47203beb5..0de86906c 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -7110,8 +7110,7 @@ BUILDIN_FUNC(itemskill)
id=script_getnum(st,2);
lv=script_getnum(st,3);
- // 詠唱中にスキルアイテムは使用できない
- if(sd->ud.skilltimer != -1)
+ if(!sd || sd->ud.skilltimer != -1)
return 0;
sd->skillitem=id;
diff --git a/src/map/skill.c b/src/map/skill.c
index 1279aa822..aa62dd4ee 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1440,9 +1440,6 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
else
tbl = bl;
- if (tbl != src && !battle_check_range(src, tbl, skill_get_range2(src, skill, skilllv)))
- continue; //Autoskills DO check for target-src range. [Skotlex]
- rate = skill_get_inf(skill);
switch (skill_get_casttype(skill)) {
case CAST_GROUND:
skill_castend_pos2(src, tbl->x, tbl->y, skill, skilllv, tick, 0);
@@ -1615,9 +1612,6 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
else
tbl = src;
- if (tbl != bl && !battle_check_range(bl, tbl, skill_get_range2(bl, skillid, skilllv)))
- continue; //Autoskills DO check for target-src range. [Skotlex]
-
switch (skill_get_casttype(skillid)) {
case CAST_GROUND:
skill_castend_pos2(bl, tbl->x, tbl->y, skillid, skilllv, tick, 0);
@@ -7964,7 +7958,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
nullpo_retr(0, sd);
- if (lv <= 0) return 0;
+ if (lv <= 0 || sd->chatID) return 0;
if( battle_config.gm_skilluncond &&
pc_isGM(sd)>= battle_config.gm_skilluncond &&