Compare commits

..

No commits in common. "1e017b925dd4a3a6f140268bdf928729b2b5b629" and "0daabfdb8fe17acf66453614a6afb1bbaad46cc7" have entirely different histories.

View File

@ -47,12 +47,10 @@ foreach (Player in AllPlayers) {
} }
declare Text[] Map_LoginsToRespawn; declare Text[] Map_LoginsToRespawn;
declare Text Map_TeamsConfig;
*** ***
***Match_StartMap*** ***Match_StartMap***
*** ***
Map_TeamsConfig = S_TeamsConfig;
if (S_TeamsConfig != "") { if (S_TeamsConfig != "") {
declare Integer[Text] TeamsConfig ; declare Integer[Text] TeamsConfig ;
TeamsConfig.fromjson(S_TeamsConfig); TeamsConfig.fromjson(S_TeamsConfig);
@ -69,8 +67,6 @@ if (S_TeamsConfig != "") {
UI.SendChat("$ff3You play for the team $fff"^ ClanId); UI.SendChat("$ff3You play for the team $fff"^ ClanId);
} }
} }
Race::SetRespawnBehaviour(Race::C_RespawnBehaviour_NeverGiveUp);
*** ***
***Match_PlayLoop*** ***Match_PlayLoop***
@ -119,33 +115,6 @@ foreach (LoginToRespawn in Map_LoginsToRespawn) {
RespawnPlayer(Player); RespawnPlayer(Player);
} }
} }
if (Map_TeamsConfig != S_TeamsConfig) {
Map_TeamsConfig = S_TeamsConfig;
if (S_TeamsConfig != "") {
declare Integer[Text] TeamsConfig ;
TeamsConfig.fromjson(S_TeamsConfig);
foreach (Player in AllPlayers) {
declare Integer ClanId = TeamsConfig.get(Player.User.WebServicesUserId, 0);
Player.Score.LadderClan = ClanId;
if (Player.SpawnStatus == CSmPlayer::ESpawnStatus::NotSpawned) {
log("Attributing Player "^ Player.User.Name ^" to the clan " ^ ClanId);
SetPlayerClan(Player, ClanId);
} else {
log("Can't apply Player "^ Player.User.Name ^" to the clan " ^ ClanId ^ " because they is playing");
}
UpdateClanStates(Player.Score.LadderClan);
declare CUIConfig UI <=> UIManager.GetUI(Player);
if (UI == Null) continue;
UI.SendChat("$ff3You play for the team $fff"^ ClanId);
}
}
}
*** ***
Void ApplyModeToPlayer(CSmPlayer _Player, Boolean _Lock) { Void ApplyModeToPlayer(CSmPlayer _Player, Boolean _Lock) {