summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-05 21:21:26 +0000
committerKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-05 21:21:26 +0000
commit3632377af3098a12fa80819ab74b24bde6c4f666 (patch)
treeea8f492d8f80d7afcd85b47f468176045dbfe2c8
parent879f41f03302a0767498915c5ca5fe35229ddff6 (diff)
downloadhercules-3632377af3098a12fa80819ab74b24bde6c4f666.tar.gz
hercules-3632377af3098a12fa80819ab74b24bde6c4f666.tar.bz2
hercules-3632377af3098a12fa80819ab74b24bde6c4f666.tar.xz
hercules-3632377af3098a12fa80819ab74b24bde6c4f666.zip
Fixed unable to move after using a skill to break out of sprint. (bugreport: 1155)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12497 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/unit.c7
2 files changed, 5 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index db3262d8a..11b8c337b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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.
2008/04/05
+ * Fixed unable to move after using a skill to break out of sprint. (r12497) [Kevin]
* DMG no longer stops running. (r12488) [Kevin]
2008/04/04
* PCs/Mobs/NPCs now block Leap(TK_HIGHJUMP) and sprint(TK_RUN). (r12485) [Kevin]
diff --git a/src/map/unit.c b/src/map/unit.c
index 6270c6c7a..575e95c1e 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -660,9 +660,10 @@ int unit_stop_walking(struct block_list *bl,int type)
if(bl->type == BL_PET && type&~0xff)
ud->canmove_tick = gettick() + (type>>8);
- //Don't stop running because of dmg, just apply the instant stop then keep running [Kevin]
- //if (ud->state.running)
- // status_change_end(bl, SC_RUN, -1);
+ //Readded, the check in unit_set_walkdelay means dmg during running won't fall through to this place in code [Kevin]
+ if (ud->state.running)
+ status_change_end(bl, SC_RUN, -1);
+
return 1;
}