From 534081a3fe750e2f743c1eff8d74a0411b1f8859 Mon Sep 17 00:00:00 2001
From: btd <bardadymchik@gmail.com>
Date: Fri, 30 Jul 2010 20:14:53 +0400
Subject: [PATCH] Fix emo color

---
 .gitignore                      | 9 +++++----
 src/game/server/gamecontext.cpp | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 34e8a2dbd..dec1ae619 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,9 @@ objs
 datasrc/*.pyc
 config.lua
 
-teeworlds_d
-teeworlds_srv_d
-bam.exe
+teeworlds_d*
+teeworlds_srv_d*
+bam*
 build server.bat
-buildlog.txt
\ No newline at end of file
+buildlog.txt
+autoexec.cfg
\ No newline at end of file
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index 24d98d09c..364dab0b2 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -926,7 +926,7 @@ void CGameContext::OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId)
 			return;
 			
 		p->m_Last_ChangeInfo = time_get();
-		if (p->m_ColorSet|| g_Config.m_SvAllowColorChange)
+		if (!p->m_ColorSet|| g_Config.m_SvAllowColorChange)
 		{
 			p->m_TeeInfos.m_UseCustomColor = pMsg->m_UseCustomColor;
 			p->m_TeeInfos.m_ColorBody = pMsg->m_ColorBody;