From 2cdfad37ad62df261fd9d196d80d66f8e755941c Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Sun, 1 Dec 2019 16:51:06 +0100 Subject: [PATCH] fix --- ReallifeGamemode.Client/util/Gangwar.ts | 1 - ReallifeGamemode.Server/Events/Death.cs | 2 +- ReallifeGamemode.Server/Gangwar/Gangwar.cs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Client/util/Gangwar.ts b/ReallifeGamemode.Client/util/Gangwar.ts index edfa8e7c..dbe8ee5d 100644 --- a/ReallifeGamemode.Client/util/Gangwar.ts +++ b/ReallifeGamemode.Client/util/Gangwar.ts @@ -349,7 +349,6 @@ gangturfs = []; turfs.forEach(function (turf) { if (turf.Id != undefined) { - mp.gui.chat.push(turf.Owner); gangturfs[gangturfs.length] = new Gangturf(turf.Name, turf.Id, turf.X, turf.Y, turf.Range, turf.Color, turf.Rotation, turf.Owner, false); } }); diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index cc0c9810..04983d00 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -51,7 +51,7 @@ namespace ReallifeGamemode.Server.Events killerHeading = killer.Heading; if(player.HasData("inGangWar") && killer.HasData("inGangWar")) { - + Gangwar.Gangwar.GangwarKill(killer, player); } if (player != killer) diff --git a/ReallifeGamemode.Server/Gangwar/Gangwar.cs b/ReallifeGamemode.Server/Gangwar/Gangwar.cs index cfce2994..8211f01d 100644 --- a/ReallifeGamemode.Server/Gangwar/Gangwar.cs +++ b/ReallifeGamemode.Server/Gangwar/Gangwar.cs @@ -42,7 +42,7 @@ namespace ReallifeGamemode.Server.Gangwar NAPI.ClientEvent.TriggerClientEventForAll("GangAreas:Create", JsonConvert.SerializeObject(turfs.ToArray())); } - public void GangwarKill(Client killer, Client victim) + public static void GangwarKill(Client killer, Client victim) { if (killer.HasData("GotInsideOfTurf") && victim.HasData("GotInsideOfTurf")) {