X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fteamplay.qc;h=d991794b75b69e9107c48577fe89602821a291bd;hb=af376cc21c7130e4d62257778b6f08fb03056120;hp=7023768219e15fe6fc108ec8e702084e51e8a62d;hpb=84c73d80872eb550a77fdcb255e762474a3456e6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 702376821..d991794b7 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -87,8 +87,8 @@ void InitGameplayMode()
 
 string GetClientVersionMessage(entity this)
 {
-	if (this.version_mismatch) {
-		if(this.version < autocvar_gameversion) {
+	if (CS(this).version_mismatch) {
+		if(CS(this).version < autocvar_gameversion) {
 			return strcat("This is Xonotic ", autocvar_g_xonoticversion,
 				"\n^3Your client version is outdated.\n\n\n### YOU WON'T BE ABLE TO PLAY ON THIS SERVER ###\n\n\nPlease update!!!^8");
 		} else {
@@ -224,7 +224,7 @@ void CheckAllowedTeams (entity for_whom)
 
 	string teament_name = string_null;
 
-	bool mutator_returnvalue = MUTATOR_CALLHOOK(CheckAllowedTeams, teams_mask, teament_name);
+	bool mutator_returnvalue = MUTATOR_CALLHOOK(CheckAllowedTeams, teams_mask, teament_name, for_whom);
 	teams_mask = M_ARGV(0, float);
 	teament_name = M_ARGV(1, string);
 
@@ -351,7 +351,7 @@ void GetTeamCounts(entity ignore)
 					cb1 = cb1 + bvalue;
 				}
 			}
-			if(t == NUM_TEAM_2)
+			else if(t == NUM_TEAM_2)
 			{
 				if(c2 >= 0)
 				{
@@ -359,7 +359,7 @@ void GetTeamCounts(entity ignore)
 					cb2 = cb2 + bvalue;
 				}
 			}
-			if(t == NUM_TEAM_3)
+			else if(t == NUM_TEAM_3)
 			{
 				if(c3 >= 0)
 				{
@@ -367,7 +367,7 @@ void GetTeamCounts(entity ignore)
 					cb3 = cb3 + bvalue;
 				}
 			}
-			if(t == NUM_TEAM_4)
+			else if(t == NUM_TEAM_4)
 			{
 				if(c4 >= 0)
 				{