summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
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;