summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/atcommand.c31
-rw-r--r--src/map/mob.c5
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/skill.c26
4 files changed, 43 insertions, 21 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 64396fa4b..b104633a6 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2922,6 +2922,17 @@ int atcommand_gm(const int fd, struct map_session_data* sd, const char* command,
return 0;
}
+static int atcommand_stopattack(struct block_list *bl,va_list ap)
+{
+ struct unit_data *ud = unit_bl2ud(bl);
+ int id = va_arg(ap, int);
+ if (ud && ud->attacktimer != INVALID_TIMER && (!id || id == ud->target))
+ {
+ unit_stop_attack(bl);
+ return 1;
+ }
+ return 0;
+}
/*==========================================
*
*------------------------------------------
@@ -2953,6 +2964,7 @@ int atcommand_pvpoff(const int fd, struct map_session_data* sd, const char* comm
map[sd->bl.m].flag.pvp = 0;
clif_send0199(sd->bl.m, 0);
map_foreachinmap(atcommand_pvpoff_sub,sd->bl.m, BL_PC);
+ map_foreachinmap(atcommand_stopattack,sd->bl.m, BL_CHAR, 0);
clif_displaymessage(fd, msg_txt(31)); // PvP: Off.
return 0;
}
@@ -3005,6 +3017,7 @@ int atcommand_gvgoff(const int fd, struct map_session_data* sd, const char* comm
if (map[sd->bl.m].flag.gvg) {
map[sd->bl.m].flag.gvg = 0;
clif_send0199(sd->bl.m, 0);
+ map_foreachinmap(atcommand_stopattack,sd->bl.m, BL_CHAR, 0);
clif_displaymessage(fd, msg_txt(33)); // GvG: Off.
} else {
clif_displaymessage(fd, msg_txt(162)); // GvG is already Off.
@@ -6888,10 +6901,11 @@ int atcommand_killer(const int fd, struct map_session_data* sd, const char* comm
sd->state.killer = !sd->state.killer;
if(sd->state.killer)
- clif_displaymessage(fd, msg_txt(241));
- else
- clif_displaymessage(fd, msg_txt(287));
-
+ clif_displaymessage(fd, msg_txt(241));
+ else {
+ clif_displaymessage(fd, msg_txt(287));
+ pc_stop_attack(sd);
+ }
return 0;
}
@@ -6906,10 +6920,11 @@ int atcommand_killable(const int fd, struct map_session_data* sd, const char* co
sd->state.killable = !sd->state.killable;
if(sd->state.killable)
- clif_displaymessage(fd, msg_txt(242));
- else
- clif_displaymessage(fd, msg_txt(288));
-
+ clif_displaymessage(fd, msg_txt(242));
+ else {
+ clif_displaymessage(fd, msg_txt(288));
+ map_foreachinrange(atcommand_stopattack,&sd->bl, AREA_SIZE, BL_CHAR, sd->bl.id);
+ }
return 0;
}
diff --git a/src/map/mob.c b/src/map/mob.c
index ee7dfa8c3..4cde44b84 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2121,7 +2121,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
intif_GMmessage(message,strlen(message)+1,0);
}
- if(mvp_sd->weight*2 > mvp_sd->max_weight)
+ if((temp = mvp_sd->weight*2 > mvp_sd->max_weight))
map_addflooritem(&item,1,mvp_sd->bl.m,mvp_sd->bl.x,mvp_sd->bl.y,mvp_sd,second_sd,third_sd,1);
else if((temp = pc_additem(mvp_sd,&item,1))) {
clif_additem(sd,0,0,temp);
@@ -2130,7 +2130,8 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
if(log_config.enable_logs&0x200) {//Logs items, MVP prizes [Lupus]
log_pick_mob(md, "M", item.nameid, -1, NULL);
- log_pick_pc(mvp_sd, "P", item.nameid, 1, NULL);
+ if (!temp)
+ log_pick_pc(mvp_sd, "P", item.nameid, 1, NULL);
}
break;
}
diff --git a/src/map/pc.c b/src/map/pc.c
index 7ed9c5245..e8515b553 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5805,6 +5805,8 @@ int pc_setoption(struct map_session_data *sd,int type)
new_look = sd->vd.class_;
}
if (new_look) {
+ //Stop attacking on new view change (to prevent wedding/santa attacks.
+ pc_stop_attack(sd);
clif_changelook(&sd->bl,LOOK_BASE,new_look);
if (sd->vd.cloth_color)
clif_changelook(&sd->bl,LOOK_CLOTHES_COLOR,sd->vd.cloth_color);
diff --git a/src/map/skill.c b/src/map/skill.c
index 93345b559..bb22057b4 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4625,15 +4625,21 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
for(i=0;i<SC_MAX;i++){
if (tsc->data[i].timer == -1)
continue;
- if(i==SC_HALLUCINATION || i==SC_WEIGHT50 || i==SC_WEIGHT90
- || i==SC_STRIPWEAPON || i==SC_STRIPSHIELD || i==SC_STRIPARMOR || i==SC_STRIPHELM
- || i==SC_CP_WEAPON || i==SC_CP_SHIELD || i==SC_CP_ARMOR || i==SC_CP_HELM
- || i==SC_COMBO || i==SC_DANCING || i==SC_GUILDAURA || i==SC_EDP
- || i==SC_AUTOBERSERK || i==SC_CARTBOOST || i==SC_MELTDOWN
- || i==SC_SAFETYWALL || i==SC_SMA || i==SC_SPEEDUP0
- || i==SC_NOCHAT
- )
+ switch (i) {
+ case SC_WEIGHT50: case SC_WEIGHT90: case SC_HALLUCINATION:
+ case SC_STRIPWEAPON: case SC_STRIPSHIELD: case SC_STRIPARMOR:
+ case SC_STRIPHELM: case SC_CP_WEAPON: case SC_CP_SHIELD:
+ case SC_CP_ARMOR: case SC_CP_HELM: case SC_COMBO:
+ case SC_STRFOOD: case SC_AGIFOOD: case SC_VITFOOD:
+ case SC_INTFOOD: case SC_DEXFOOD: case SC_LUKFOOD:
+ case SC_HITFOOD: case SC_FLEEFOOD: case SC_BATKFOOD:
+ case SC_WATKFOOD: case SC_MATKFOOD: case SC_DANCING:
+ case SC_GUILDAURA: case SC_EDP: case SC_AUTOBERSERK:
+ case SC_CARTBOOST: case SC_MELTDOWN: case SC_SAFETYWALL:
+ case SC_SMA: case SC_SPEEDUP0: case SC_NOCHAT:
+ case SC_ANKLE:
continue;
+ }
if(i==SC_BERSERK) tsc->data[i].val2=0; //Mark a dispelled berserk to avoid setting hp to 100 by setting hp penalty to 0.
status_change_end(bl,i,-1);
}
@@ -4712,10 +4718,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
else
hp = 0;
- if (skilllv > 1 && sp) //Recover some of the SP used
+ if (sp) //Recover some of the SP used
sp = sp*(25*(skilllv-1))/100;
- else
- sp = 0;
if(hp || sp)
status_heal(src, hp, sp, 2);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-10 14:46:42 +0000