Browse Source

Added a missing client update when the mute status is manually cancelled by a GM
(followup to r12079)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12169 54d463be-8e91-2dee-dedb-b68131a5f0ec

ultramage 17 years ago
parent
commit
5ce5cdb524
2 changed files with 6 additions and 1 deletions
  1. 1 1
      src/common/socket.c
  2. 5 0
      src/map/status.c

+ 1 - 1
src/common/socket.c

@@ -575,7 +575,7 @@ int realloc_writefifo(int fd, size_t addition)
 		while( session[fd]->wdata_size + addition > newsize ) newsize += newsize;
 		while( session[fd]->wdata_size + addition > newsize ) newsize += newsize;
 	}
 	}
 	else
 	else
-	if( session[fd]->max_wdata >= 2*(session[fd]->flag.server?FIFOSIZE_SERVERLINK:WFIFO_SIZE)
+	if( session[fd]->max_wdata >= (size_t)2*(session[fd]->flag.server?FIFOSIZE_SERVERLINK:WFIFO_SIZE)
 		&& (session[fd]->wdata_size+addition)*4 < session[fd]->max_wdata )
 		&& (session[fd]->wdata_size+addition)*4 < session[fd]->max_wdata )
 	{	// shrink rule, shrink by 2 when only a quarter of the fifo is used, don't shrink below nominal size.
 	{	// shrink rule, shrink by 2 when only a quarter of the fifo is used, don't shrink below nominal size.
 		newsize = session[fd]->max_wdata / 2;
 		newsize = session[fd]->max_wdata / 2;

+ 5 - 0
src/map/status.c

@@ -6378,6 +6378,11 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
 		case SC_NOCHAT:
 		case SC_NOCHAT:
 			if (sd && sd->status.manner < 0 && tid != -1)
 			if (sd && sd->status.manner < 0 && tid != -1)
 				sd->status.manner = 0;
 				sd->status.manner = 0;
+			if (sd)
+			{
+				clif_changestatus(&sd->bl,SP_MANNER,sd->status.manner);
+				clif_updatestatus(sd,SP_MANNER);
+			}
 			break;
 			break;
 		case SC_SPLASHER:	
 		case SC_SPLASHER:	
 			{
 			{