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

GangwarFix zweiter Tag 4

Browse Source
This commit is contained in:
VegaZ
2021-03-30 20:30:36 +02:00
parent 9d4bb6ff7b
commit e00194e023
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Client/util/Gangwar.ts
View File

@@ -502,7 +502,7 @@
gangturfs[gangturfs.length - 1].edit = false; gangturfs[gangturfs.length - 1].edit = false;
gangturfs.forEach(function (turf) { gangturfs.forEach(function (turf) {
turf._status = "disabled"; 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) { if (turf.leaderColShape != null) {
turf.leaderColShape.destroy(); turf.leaderColShape.destroy();
turf.leaderColShape = null; turf.leaderColShape = null;
@@ -510,7 +510,6 @@
if (turf._marker) if (turf._marker)
if (turf.blip != null) { if (turf.blip != null) {
mp.game.ui.removeBlip(turf.blip); mp.game.ui.removeBlip(turf.blip);
mp.game.invoke(Natives.SET_BLIP_ALPHA, turf.blip, 0);
} }
if (turf.leaderBlip != null) { if (turf.leaderBlip != null) {
mp.game.ui.removeBlip(turf.leaderBlip); mp.game.ui.removeBlip(turf.leaderBlip);
@@ -518,7 +517,6 @@
if (turf.attackBlip != null) { if (turf.attackBlip != null) {
mp.game.ui.removeBlip(turf.attackBlip); mp.game.ui.removeBlip(turf.attackBlip);
} }
Natives
}); });
} }
clearBlips(); clearBlips();

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

@@ -152,7 +152,7 @@ namespace ReallifeGamemode.Server.Gangwar
foreach (Player gangwarPlayer in this.playerInGangwar) 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) if (this.Att_Score >= 200)
{ {
@@ -163,7 +163,7 @@ namespace ReallifeGamemode.Server.Gangwar
this.takeOver(this.Owner); this.takeOver(this.Owner);
} }
timerCount += 1; 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) if (this.Att_Score > this.Def_Score)
{ {