From: Lyberta <lyberta@lyberta.net>
Date: Sun, 27 Aug 2017 23:44:07 +0000 (+0300)
Subject: Merged master into Lyberta/TeamplayFixes_.
X-Git-Tag: xonotic-v0.8.5~2482^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=04692f3bf447ec38a1bbb0a330c288bbe7a42726;p=xonotic%2Fxonotic-data.pk3dir.git

Merged master into Lyberta/TeamplayFixes_.
---

04692f3bf447ec38a1bbb0a330c288bbe7a42726
diff --cc qcsrc/server/command/sv_cmd.qc
index 4687403d2,2bb0f1365..f5569c08f
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@@ -1091,15 -1095,9 +1095,15 @@@ void GameCommand_moveplayer(float reque
  
  								// If so, lets continue and finally move the player
  								client.team_forced = 0;
 -								MoveToTeam(client, team_id, 6);
 -								successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
 -								LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.");
 +								if (MoveToTeam(client, team_id, 6))
 +								{
 +									successful = strcat(successful, (successful ? ", " : ""), playername(client, false));
- 									LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.\n");
++									LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.");
 +								}
 +								else
 +								{
 +									LOG_INFO("Unable to move player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ")");
 +								}
  								continue;
  							}
  							else
diff --cc qcsrc/server/scores_rules.qc
index 5ee25f5bf,2b539c999..d46d95bd1
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@@ -1,8 -1,10 +1,11 @@@
  #include "scores_rules.qh"
  
+ #include <server/defs.qh>
+ #include <server/miscfunctions.qh>
  #include "client.qh"
  #include "scores.qh"
+ #include <common/gamemodes/rules.qh>
 +#include "teamplay.qh"
  
  int ScoreRules_teams;