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

[HOTFIX] Gangwar starten crasht Server nicht mehr

Browse Source
This commit is contained in:
hydrant
2021-04-09 19:47:03 +02:00
parent 501d8aa203
commit 81f8aed647
1 changed files with 56 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,35 +133,15 @@ namespace ReallifeGamemode.Server.Gangwar
private void update() private void update()
{ {
#region Ticket system NAPI.Task.Run(() =>
/*
try
{ {
Player[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.GetUser().Faction.Name == this.Owner).ToArray();
Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.GetUser().Faction.Name == this.Attacker).ToArray();
}catch(NullReferenceException ex)
{
int i = 0;
foreach(var c in playerInGangwar)
{
if (!NAPI.Entity.DoesEntityExist(c.Handle))
{
this.playerInside = this.playerInside.Where(gp => gp != c).ToArray();
}
i++;
}
}
if (owners.Length > attackers.Length)
this.Att_Score -= owners.Length - attackers.Length;
if(owners.Length < attackers.Length)
this.Def_Score -= attackers.Length - owners.Length;
*/
#endregion Ticket system
foreach (Player gangwarPlayer in this.playerInGangwar) foreach (Player gangwarPlayer in this.playerInGangwar)
{ {
if(!gangwarPlayer.IsLoggedIn())
{
continue;
}
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score, 900 - timerCount); gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score, 900 - timerCount);
} }
/*if (this.Att_Score >= 200) /*if (this.Att_Score >= 200)
@@ -179,6 +159,11 @@ namespace ReallifeGamemode.Server.Gangwar
{ {
foreach (Player gangwarPlayer in this.playerInGangwar) foreach (Player gangwarPlayer in this.playerInGangwar)
{ {
if(!gangwarPlayer.IsLoggedIn())
{
continue;
}
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0, 0); gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0, 0);
} }
this.takeOver(this.Attacker); this.takeOver(this.Attacker);
@@ -199,6 +184,11 @@ namespace ReallifeGamemode.Server.Gangwar
{ {
foreach (Player gangwarPlayer in this.playerInGangwar) foreach (Player gangwarPlayer in this.playerInGangwar)
{ {
if (!gangwarPlayer.IsLoggedIn())
{
continue;
}
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0, 0); gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0, 0);
} }
this.takeOver(this.Owner); this.takeOver(this.Owner);
@@ -206,6 +196,7 @@ namespace ReallifeGamemode.Server.Gangwar
return; return;
} }
} }
});
} }
public void enter(Player client) public void enter(Player client)
@@ -215,7 +206,7 @@ namespace ReallifeGamemode.Server.Gangwar
{ {
if (user.Faction.Name != getOwner() && user.Faction.Name != getAttacker()) if (user.Faction.Name != getOwner() && user.Faction.Name != getAttacker())
return; return;
Player gPlayer = playerInGangwar.Where(c => c != null && !c.Handle.IsNull && c.IsLoggedIn() && c.GetUser().Id == user.Id).FirstOrDefault(); Player gPlayer = playerInGangwar.Where(c => c != null && !c.Handle.IsNull && c.IsLoggedIn() && c.GetUser()?.Id == user.Id).FirstOrDefault();
if (gPlayer == null) if (gPlayer == null)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
@@ -294,6 +285,11 @@ namespace ReallifeGamemode.Server.Gangwar
this.Attacker = null; this.Attacker = null;
foreach (var c in playerInGangwar) foreach (var c in playerInGangwar)
{ {
if (!c.IsLoggedIn())
{
continue;
}
c.TriggerEvent("CLIENT:setAttackBlip", false, TurfID); c.TriggerEvent("CLIENT:setAttackBlip", false, TurfID);
c.ResetData("inGangWar"); c.ResetData("inGangWar");
c.ResetData("GotInsideOfTurf"); c.ResetData("GotInsideOfTurf");