summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-11-16 16:39:51 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-11-16 16:39:51 +0000
commit033b872492a71c384b8f7cc722fc9e5349fa1cdf (patch)
treebf0796f8fde5e056b9f7ef0ee1f468a524b61687
parentcef84b99cace2357a872ac2939f62ce08f916318 (diff)
downloadhercules-033b872492a71c384b8f7cc722fc9e5349fa1cdf.tar.gz
hercules-033b872492a71c384b8f7cc722fc9e5349fa1cdf.tar.bz2
hercules-033b872492a71c384b8f7cc722fc9e5349fa1cdf.tar.xz
hercules-033b872492a71c384b8f7cc722fc9e5349fa1cdf.zip
* Fixed natural expiration of GM mute printing the unmute message twice (since r12169).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14994 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/status.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1674699a2..fda98a3a3 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,5 +1,7 @@
Date Added
+2011/11/16
+ * Fixed natural expiration of GM mute printing the unmute message twice (since r12169). [Ai4rei]
2011/11/12
* Fixed npc class HIDDEN_WARP_NPC (139) being sent to the client, causing client crashes in poring war. It's a server-side "sprite" only. [Ai4rei]
- Updated Aegis NPC ID constants from current npcidentity.lub (569~603).
diff --git a/src/map/status.c b/src/map/status.c
index 26c0c1b2f..4df2c80d6 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6666,7 +6666,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
case SC_NOCHAT:
if (sd && sd->status.manner < 0 && tid != INVALID_TIMER)
sd->status.manner = 0;
- if (sd)
+ if (sd && tid == INVALID_TIMER)
{
clif_changestatus(&sd->bl,SP_MANNER,sd->status.manner);
clif_updatestatus(sd,SP_MANNER);