summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-23 21:42:16 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-23 21:42:16 +0000
commite814ae4c656fe862d90e103343f70522c88f51c1 (patch)
treeda9b59b075904e613e27c1c7f9f458733d00fe9b
parentb1fbbb9cbd24d9fba1c4475e0ef53117c4e09a69 (diff)
downloadhercules-e814ae4c656fe862d90e103343f70522c88f51c1.tar.gz
hercules-e814ae4c656fe862d90e103343f70522c88f51c1.tar.bz2
hercules-e814ae4c656fe862d90e103343f70522c88f51c1.tar.xz
hercules-e814ae4c656fe862d90e103343f70522c88f51c1.zip
Minor update to atcommand_jailfor and atcommand_char_ban's modif_p var incrementation for minute-based bans/jails.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13910 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/atcommand.c10
2 files changed, 10 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 092688d1b..c81a41857 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+09/06/23
+ * Minor update to atcommand_jailfor and atcommand_char_ban's modif_p var incrementation for minute-based bans/jails. [Paradox924X]
09/06/20
* Changed Asura Strike/Jump Kick to target skill to get rid of the "target delay". (bugreport:2174) [Inkfish]
09/06/19
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 16fe6ee28..b55a94aea 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3347,7 +3347,10 @@ int atcommand_char_ban(const int fd, struct map_session_data* sd, const char* co
if (modif_p[0] == 's') {
second = value;
modif_p++;
- } else if (modif_p[0] == 'n' || (modif_p[0] == 'm' && modif_p[1] == 'n')) {
+ } else if (modif_p[0] == 'n') {
+ minute = value;
+ modif_p++;
+ } else if (modif_p[0] == 'm' && modif_p[1] == 'n') {
minute = value;
modif_p = modif_p + 2;
} else if (modif_p[0] == 'h') {
@@ -5010,7 +5013,10 @@ int atcommand_jailfor(const int fd, struct map_session_data* sd, const char* com
modif_p++;
while (modif_p[0] >= '0' && modif_p[0] <= '9')
modif_p++;
- if (modif_p[0] == 'n' || (modif_p[0] == 'm' && modif_p[1] == 'n')) {
+ if (modif_p[0] == 'n') {
+ minute = value;
+ modif_p++;
+ } else if (modif_p[0] == 'm' && modif_p[1] == 'n') {
minute = value;
modif_p = modif_p + 2;
} else if (modif_p[0] == 'h') {