From e00194e0238bb142a076f98284ee0ada492fc555 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Tue, 30 Mar 2021 20:30:36 +0200 Subject: [PATCH] GangwarFix zweiter Tag 4 --- ReallifeGamemode.Client/util/Gangwar.ts | 4 +--- ReallifeGamemode.Server/Gangwar/Turf.cs | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Client/util/Gangwar.ts b/ReallifeGamemode.Client/util/Gangwar.ts index 6e32d47b..44d876d4 100644 --- a/ReallifeGamemode.Client/util/Gangwar.ts +++ b/ReallifeGamemode.Client/util/Gangwar.ts @@ -502,7 +502,7 @@ gangturfs[gangturfs.length - 1].edit = false; gangturfs.forEach(function (turf) { turf._status = "disabled"; - turf.id = -420; //Due to garbage collecting this value needs to be negative, so that the Server doesn't find multiple Turfs in the Database with same ID's. + turf.id = null; //Due to garbage collecting this value needs to be negative, so that the Server doesn't find multiple Turfs in the Database with same ID's. if (turf.leaderColShape != null) { turf.leaderColShape.destroy(); turf.leaderColShape = null; @@ -510,7 +510,6 @@ if (turf._marker) if (turf.blip != null) { mp.game.ui.removeBlip(turf.blip); - mp.game.invoke(Natives.SET_BLIP_ALPHA, turf.blip, 0); } if (turf.leaderBlip != null) { mp.game.ui.removeBlip(turf.leaderBlip); @@ -518,7 +517,6 @@ if (turf.attackBlip != null) { mp.game.ui.removeBlip(turf.attackBlip); } - Natives }); } clearBlips(); diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs index b4c35f18..2e40b1eb 100644 --- a/ReallifeGamemode.Server/Gangwar/Turf.cs +++ b/ReallifeGamemode.Server/Gangwar/Turf.cs @@ -152,7 +152,7 @@ namespace ReallifeGamemode.Server.Gangwar foreach (Player gangwarPlayer in this.playerInGangwar) { - gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score, 60 - timerCount); + gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score, 40 - timerCount); } if (this.Att_Score >= 200) { @@ -163,7 +163,7 @@ namespace ReallifeGamemode.Server.Gangwar this.takeOver(this.Owner); } timerCount += 1; - if (timerCount >= 60) //change to 900 (seconds) before release for testing reasons change to whatever you like + if (timerCount >= 40) //change to 900 (seconds) before release for testing reasons change to whatever you like { if (this.Att_Score > this.Def_Score) {