From 012b686e7cede65476bf37ef63d2271f6efdb002 Mon Sep 17 00:00:00 2001 From: elexis Date: Wed, 2 Mar 2016 13:42:47 +0000 Subject: [PATCH] Two early returns. Refs #3265. This was SVN commit r17813. --- .../public/simulation/components/Player.js | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/binaries/data/mods/public/simulation/components/Player.js b/binaries/data/mods/public/simulation/components/Player.js index d0f5f42090..6e3b30cbbe 100644 --- a/binaries/data/mods/public/simulation/components/Player.js +++ b/binaries/data/mods/public/simulation/components/Player.js @@ -363,27 +363,25 @@ Player.prototype.GetTeam = function() Player.prototype.SetTeam = function(team) { - if (!this.teamsLocked) - { - this.team = team; + if (this.teamsLocked) + return; - var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager); - if (cmpPlayerManager && this.team != -1) + this.team = team; + + // Set all team members as allies + let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager); + if (cmpPlayerManager && this.team != -1) + for (let i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i) { - // Set all team members as allies - for (var i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i) - { - var cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(i), IID_Player); - if (this.team == cmpPlayer.GetTeam()) - { - this.SetAlly(i); - cmpPlayer.SetAlly(this.playerID); - } - } + let cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(i), IID_Player); + if (this.team != cmpPlayer.GetTeam()) + continue; + + this.SetAlly(i); + cmpPlayer.SetAlly(this.playerID); } - Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID}); - } + Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID }); }; Player.prototype.SetLockTeams = function(value)