Skip to content

Commit b60d975

Browse files
committed
Does build work at all?
1 parent 0688053 commit b60d975

1 file changed

Lines changed: 1 addition & 23 deletions

File tree

ZkLobbyServer/ServerBattle.cs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public class ServerBattle : Battle
5555
protected bool IsPollsBlocked => IsAutohost && DateTime.UtcNow < BlockPollsUntil;
5656

5757
private List<KickedPlayer> kickedPlayers = new List<KickedPlayer>();
58-
private List<string> previousGamePlayers = new List<string>();
5958
public List<BattleDebriefing> Debriefings { get; private set; } = new List<BattleDebriefing>();
6059

6160
private Timer pollTimer;
@@ -208,13 +207,6 @@ public ConnectSpring GetConnectSpringStructure(string scriptPassword, bool isSpe
208207
};
209208
}
210209

211-
public bool IsInPreviousGame(string name)
212-
{
213-
var inPrevious = false;
214-
if (previousGamePlayers.Any(y => y.Name == name)) inPrevious = true;
215-
return inPrevious;
216-
}
217-
218210
public bool IsKicked(string name)
219211
{
220212
var kicked = false;
@@ -1061,11 +1053,7 @@ public virtual void ValidateBattleStatus(UserBattleStatus ubs)
10611053
SayBattle("Your Rank (" + Ranks.RankNames[ubs.LobbyUser.Rank] + ") is too low. The minimum Rank to play in this battle is " + Ranks.RankNames[MinRank] + ".", ubs.Name);
10621054
}
10631055
}
1064-
if (ubs.QueueOrder <= 0)
1065-
{
1066-
ubs.QueueOrder = ++QueueCounter;
1067-
if IsInPreviousGame(ubs.Name) ubs.QueueOrder += 1000;
1068-
}
1056+
if (ubs.QueueOrder <= 0) ubs.QueueOrder = ++QueueCounter;
10691057
}
10701058
else
10711059
{
@@ -1134,16 +1122,6 @@ protected virtual async Task OnDedicatedExited(SpringBattleContext springBattleC
11341122
//Initiate discussion time, then map vote, then start vote
11351123
discussionTimer.Interval = (DiscussionSeconds - 1) * 1000;
11361124
discussionTimer.Start();
1137-
previousGamePlayers = springBattleContext.ActualPlayers.Select(x => x.Name);
1138-
foreach (var name in previousGamePlayers)
1139-
{
1140-
UserBattleStatus ubs;
1141-
if (Users.TryGetValue(name, out ubs))
1142-
{
1143-
ubs.QueueOrder = -1;
1144-
ValidateBattleStatus(ubs);
1145-
}
1146-
}
11471125
}
11481126
}
11491127
await CheckCloseBattle();

0 commit comments

Comments
 (0)