From 9603d676c67af12294e9598cb8be68fbfafc78e7 Mon Sep 17 00:00:00 2001
From: xalduin <xalduin@gmail.com>
Date: Thu, 3 Jun 2010 17:08:05 -0400
Subject: [PATCH] Score no longer decreased when switching teams

---
 src/game/server/gamecontroller.cpp | 2 +-
 src/game/server/player.cpp         | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index 519a28ae4..66d845196 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -308,7 +308,7 @@ void IGameController::OnPlayerInfoChange(class CPlayer *pP)
 int IGameController::OnCharacterDeath(class CCharacter *pVictim, class CPlayer *pKiller, int Weapon)
 {
 	// do scoreing
-	if(!pKiller)
+	if(!pKiller || Weapon == WEAPON_GAME)
 		return 0;
 	if(pKiller == pVictim->GetPlayer())
 		pVictim->GetPlayer()->m_Score--; // suicide
diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp
index 354b81189..c295b5d5f 100644
--- a/src/game/server/player.cpp
+++ b/src/game/server/player.cpp
@@ -156,8 +156,6 @@ void CPlayer::SetTeam(int Team)
 	GameServer()->SendChat(-1, CGameContext::CHAT_ALL, Buf); 
 	
 	KillCharacter();
-	if( m_Team != -1 )	// Give a point to make up for killing character, but not if they're a spectator
-		m_Score += 1;
 
 	m_Team = Team;
 	//m_ScoreStartTick = Server()->Tick();