about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/game/client/components/emoticon.cpp2
-rw-r--r--src/game/server/hooks.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game/client/components/emoticon.cpp b/src/game/client/components/emoticon.cpp
index d76d6b22..3f2233c6 100644
--- a/src/game/client/components/emoticon.cpp
+++ b/src/game/client/components/emoticon.cpp
@@ -83,7 +83,7 @@ void EMOTICON::on_render()
 {
 	if(!active)
 	{
-		if(was_active && selected_emote)
+		if(was_active && selected_emote != -1)
 			emote(selected_emote);
 		was_active = false;
 		return;
diff --git a/src/game/server/hooks.cpp b/src/game/server/hooks.cpp
index 194fa6e1..f4ef4686 100644
--- a/src/game/server/hooks.cpp
+++ b/src/game/server/hooks.cpp
@@ -353,7 +353,7 @@ void mods_message(int msgtype, int client_id)
 	{
 		NETMSG_CL_EMOTICON *msg = (NETMSG_CL_EMOTICON *)rawmsg;
 		
-		if(config.sv_spamprotection && p->last_emote+time_freq()*5 > time_get())
+		if(config.sv_spamprotection && p->last_emote+time_freq()*3 > time_get())
 			return;
 			
 		p->last_emote = time_get();