aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/gangwar-crash' into develop

Browse Source
This commit is contained in:
hydrant
2021-04-08 23:19:29 +02:00
parent 654c17e20c 459022afb5
commit 10d61e0794
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Server/Gangwar/Turf.cs
View File

@@ -210,11 +210,12 @@ namespace ReallifeGamemode.Server.Gangwar
public void enter(Player client)
{
User user = client.GetUser();
if (this.status == "attack")
{
if (client.GetUser().Faction.Name != getOwner() && client.GetUser().Faction.Name != getAttacker())
if (user.Faction.Name != getOwner() && user.Faction.Name != getAttacker())
return;
Player gPlayer = playerInGangwar.Where(c => c.GetUser().Id == client.GetUser().Id).FirstOrDefault();
Player gPlayer = playerInGangwar.Where(c => c != null && !c.Handle.IsNull && c.IsLoggedIn() && c.GetUser().Id == user.Id).FirstOrDefault();
if (gPlayer == null)
{
using (var dbContext = new DatabaseContext())
@@ -226,6 +227,7 @@ namespace ReallifeGamemode.Server.Gangwar
}
}
if (playerInside.Find(c => c == client) == null)
{
playerInside.Add(client);