From 65aad37db9a40e70dc5985660fb5d0aa3bca735e Mon Sep 17 00:00:00 2001
From: JohnWildkins <john.wildkins@gmail.com>
Date: Fri, 1 Nov 2019 15:44:57 -0400
Subject: [PATCH] Anti-spam filter fix (#7311)

---
 code/modules/client/client procs.dm        | 4 +++-
 html/changelogs/johnwildkins-sploitfix.yml | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/johnwildkins-sploitfix.yml

diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index f279d2e7f87..6be915dab49 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -263,7 +263,9 @@
 			log_debug("SPAM_PROTECT: [src] tripped macro-trigger, now muted.")
 			return TRUE
 
-	spam_alert = max(0, spam_alert - 1)
+	else
+		spam_alert = max(0, spam_alert - 1)
+
 	return FALSE
 
 /client/proc/automute_by_duplicate(message, mute_type)
diff --git a/html/changelogs/johnwildkins-sploitfix.yml b/html/changelogs/johnwildkins-sploitfix.yml
new file mode 100644
index 00000000000..86371fb7a88
--- /dev/null
+++ b/html/changelogs/johnwildkins-sploitfix.yml
@@ -0,0 +1,6 @@
+author: JohnWildkins
+
+delete-after: True
+
+changes: 
+  - security: "Fixed an exploit relating to the anti-spam filter."