From 9934d128e5e25a06dfbe8d1841f88119009ae029 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 24 Mar 2020 23:40:36 +0100 Subject: [PATCH] set user gangwar on 1 for testing --- ReallifeGamemode.Client/Gui/playerlist.ts | 2 +- ReallifeGamemode.Server/Gangwar/Turf.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Client/Gui/playerlist.ts b/ReallifeGamemode.Client/Gui/playerlist.ts index f56055c2..689d6e1d 100644 --- a/ReallifeGamemode.Client/Gui/playerlist.ts +++ b/ReallifeGamemode.Client/Gui/playerlist.ts @@ -18,7 +18,7 @@ export default function playerList(globalData: GlobalData): void { mp.gui.cursor.show(false, false); mp.gui.chat.activate(true); } - else if (!globalData.InInput) { + else if (!globalData.InInput) { globalData.InInput = true; playerlistBrowser = mp.browsers.new('package://assets/html/Playerlist/Tabliste.html'); mp.gui.chat.activate(false); diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs index ecf22839..1713c477 100644 --- a/ReallifeGamemode.Server/Gangwar/Turf.cs +++ b/ReallifeGamemode.Server/Gangwar/Turf.cs @@ -264,7 +264,7 @@ namespace ReallifeGamemode.Server.Gangwar List ownersInGangwar = context.Users.Include(u => u.Faction).Where(u => onlinePlayers.Contains(u.Name) && u.Faction.Name == getOwner()).Select(u => u.Player).ToList(); List attackersInGangwar = context.Users.Include(u => u.Faction).Where(u => onlinePlayers.Contains(u.Name) && u.Faction.Name == getAttacker()).Select(u => u.Player).ToList(); - if (ownersInGangwar.Count < 5 && attackersInGangwar.Count < 5) + if (ownersInGangwar.Count < 1 && attackersInGangwar.Count < 1) { List leaders = context.Users.Include(u => u.Faction).Where(u => onlinePlayers.Contains(u.Name) && u.Faction.Name == getAttacker() && u.FactionLeader).Select(u => u.Player).ToList(); foreach(var l in leaders)