summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-04 21:40:36 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-04 21:40:36 +0000
commit9fc29a4aad32e17f4f3e6a3bc749c12df27ea5d8 (patch)
tree73d27c99ca76c8e633268bbb4a6dee65685d728e /src
parent02c5517d8590c2169479a90d4c1327e85614c6fb (diff)
downloadhercules-9fc29a4aad32e17f4f3e6a3bc749c12df27ea5d8.tar.gz
hercules-9fc29a4aad32e17f4f3e6a3bc749c12df27ea5d8.tar.bz2
hercules-9fc29a4aad32e17f4f3e6a3bc749c12df27ea5d8.tar.xz
hercules-9fc29a4aad32e17f4f3e6a3bc749c12df27ea5d8.zip
- 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
Diffstat (limited to 'src')
-rw-r--r--src/map/atcommand.c1
-rw-r--r--src/map/status.c3
2 files changed, 3 insertions, 1 deletions
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;