diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b403ba99e..cfc2f026c 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/12/12 + * Reverted the knockback update since it isn't working right with all + skills. * Mobs now by default are "everyone's" enemy, so mobs are able to hit each another. * Moved "unsetting" the angry mode from the mob_ai to the mob_damage function, where it'll work regardless of who hits the mob. diff --git a/src/map/clif.c b/src/map/clif.c index 11c7a4338..66711d1b2 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1865,8 +1865,8 @@ int clif_changemapserver(struct map_session_data *sd, char *mapname, int x, int int clif_blown(struct block_list *bl) { //Aegis packets says fixpos, but it's unsure whether slide works better or not. - return clif_fixpos(bl); -// return clif_slide(bl, bl->x, bl->y); +// return clif_fixpos(bl); + return clif_slide(bl, bl->x, bl->y); } /*========================================== * @@ -4550,12 +4550,14 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst, WBUFL(buf,20)=ddelay; WBUFW(buf,26)=skill_lv; WBUFW(buf,28)=div; - if (flag && src->type == BL_PC) +#if 0 + if (flag && dst->type == BL_PC) { //Needed for appropiate knockback on the receiving client. WBUFW(buf,24)=-30000; WBUFB(buf,30)=6; - clif_send(buf,packet_len_table[0x114],src,SELF); + clif_send(buf,packet_len_table[0x114],dst,SELF); } +#endif if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) { WBUFW(buf,24)=damage?div:0; } else { @@ -4587,12 +4589,14 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst, WBUFL(buf,20)=ddelay; WBUFW(buf,28)=skill_lv; WBUFW(buf,30)=div; - if (flag && src->type == BL_PC) +#if 0 + if (flag && dst->type == BL_PC) { //Needed for appropiate knockback on the receiving client. WBUFL(buf,24)=-30000; WBUFB(buf,32)=6; - clif_send(buf,packet_len_table[0x114],src,SELF); + clif_send(buf,packet_len_table[0x114],dst,SELF); } +#endif if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) { WBUFL(buf,24)=damage?div:0; } else { |