From 9fc29a4aad32e17f4f3e6a3bc749c12df27ea5d8 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 4 Sep 2006 21:40:36 +0000 Subject: - Should have fixed manner being reset to 0 on logout while muted. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8621 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/atcommand.c | 1 + src/map/status.c | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6459e5cc7..d9c71dc90 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/09/04 + * Should have fixed manner being reset to 0 on logout while muted. + [Skotlex] * Removed status_get_sc_tick, duration and chance are now both handled by status_get_sc_def (this means status change duration and success rate both will always follow the very same formula) [Skotlex] diff --git a/src/map/atcommand.c b/src/map/atcommand.c index ebcd78b2a..d99f8efd2 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -8767,6 +8767,7 @@ int atcommand_unmute( if((pl_sd=map_nick2sd((char *) message)) != NULL) { if(pl_sd->sc.data[SC_NOCHAT].timer!=-1) { + pl_sd->status.manner = 0; status_change_end(&pl_sd->bl,SC_NOCHAT,-1); clif_displaymessage(sd->fd,"Player unmuted"); } diff --git a/src/map/status.c b/src/map/status.c index 6693988a7..b55773e23 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -6015,7 +6015,8 @@ int status_change_end( struct block_list* bl , int type,int tid ) break; case SC_NOCHAT: if (sd) { - if (sd->status.manner < 0) sd->status.manner = 0; + if (sd->status.manner < 0 && tid != -1) + sd->status.manner = 0; clif_updatestatus(sd,SP_MANNER); } break; -- cgit v1.2.3-70-g09d2