diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-28 12:01:19 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-28 12:01:19 +0000 |
| commit | 27f936fb42e3b6dc9da26dfa2ffdd58e27e012bd (patch) | |
| tree | 21458ee1dc60d24efcc769a7bbbf76484e46a958 /src/map | |
| parent | 059cd7894a6908d8329ca4c68791e67d69e241d7 (diff) | |
| download | hercules-27f936fb42e3b6dc9da26dfa2ffdd58e27e012bd.tar.gz hercules-27f936fb42e3b6dc9da26dfa2ffdd58e27e012bd.tar.bz2 hercules-27f936fb42e3b6dc9da26dfa2ffdd58e27e012bd.tar.xz hercules-27f936fb42e3b6dc9da26dfa2ffdd58e27e012bd.zip | |
* Fixed Auto Berserk activating by itself when changing maps
* Corrected Yuno warp points
* Added Yuno warps to the Aldebaran kafra NPC
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1314 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index d9665b527..a3dea154f 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7579,7 +7579,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) if(battle_config.save_clothcolor==1 && sd->status.clothes_color > 0) clif_changelook(&sd->bl,LOOK_CLOTHES_COLOR,sd->status.clothes_color); - if(sd->status.hp<sd->status.max_hp>>2 && pc_checkskill(sd,SM_AUTOBERSERK)>0 && + //if(sd->status.hp<sd->status.max_hp>>2 && pc_checkskill(sd,SM_AUTOBERSERK)>0 && + if(sd->status.hp<sd->status.max_hp>>2 && sd->sc_data[SC_AUTOBERSERK].timer != -1 && (sd->sc_data[SC_PROVOKE].timer==-1 || sd->sc_data[SC_PROVOKE].val2==0 )) // オートバーサーク発動 status_change_start(&sd->bl,SC_PROVOKE,10,1,0,0,0,0); |