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

fix some things

Browse Source
This commit is contained in:
Michael
2020-08-01 00:29:31 +02:00
parent 6f57c8c93b
commit 4ec055a341
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -542,6 +542,7 @@ namespace ReallifeGamemode.Server.Events
if (!job.GetUsersInJob().Contains(player)) if (!job.GetUsersInJob().Contains(player))
{ {
jobb.StartJobEvent(player); jobb.StartJobEvent(player);
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
} }
@@ -559,6 +560,7 @@ namespace ReallifeGamemode.Server.Events
{ {
player.SetData("PilotenBase", 1); player.SetData("PilotenBase", 1);
jobb.StartJobEvent(player); jobb.StartJobEvent(player);
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
} }
@@ -574,6 +576,7 @@ namespace ReallifeGamemode.Server.Events
{ {
player.SetData("PilotenBase", 2); player.SetData("PilotenBase", 2);
jobb.StartJobEvent(player); jobb.StartJobEvent(player);
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
} }

4
ReallifeGamemode.Server/Events/Vehicle.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using GTANetworkAPI; using GTANetworkAPI;
using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;
@@ -15,6 +15,7 @@ namespace ReallifeGamemode.Server.Events
{ {
if (player.IsInVehicle && player.VehicleSeat == 0) if (player.IsInVehicle && player.VehicleSeat == 0)
{ {
player.TriggerEvent("CLIENT:SELECT_ROUTE");
GTANetworkAPI.Vehicle v = player.Vehicle; GTANetworkAPI.Vehicle v = player.Vehicle;
User u = player.GetUser(); User u = player.GetUser();
@@ -68,6 +69,7 @@ namespace ReallifeGamemode.Server.Events
} }
} }
VehicleStreaming.SetEngineState(v, !state); VehicleStreaming.SetEngineState(v, !state);
} }
} }

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

@@ -154,11 +154,11 @@ namespace ReallifeGamemode.Server.Gangwar
{ {
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score); gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score);
} }
if (this.Att_Score >= 5) if (this.Att_Score >= 200)
{ {
this.takeOver(this.Attacker); this.takeOver(this.Attacker);
} }
else if (this.Def_Score >= 5) else if (this.Def_Score >= 200)
{ {
this.takeOver(this.Owner); this.takeOver(this.Owner);
} }

2
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -458,7 +458,7 @@ namespace ReallifeGamemode.Server.Managers
} }
else else
{ {
if (amount > 0 && amount < 10000) if (amount > 0 && amount <= 10000)
{ {
player.SendNotification($"~w~Du hast ~y~{targetname} ~w~ein Ticket in Höhe von ~b~{amount}$ ~w~gestellt. Grund: ~g~{reason}~w~."); player.SendNotification($"~w~Du hast ~y~{targetname} ~w~ein Ticket in Höhe von ~b~{amount}$ ~w~gestellt. Grund: ~g~{reason}~w~.");
target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount}$ ~w~gestellt.", true); target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount}$ ~w~gestellt.", true);

3
ReallifeGamemode.Server/Managers/JobManager.cs
View File

@@ -11,6 +11,9 @@ using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Services; using ReallifeGamemode.Services;
using ReallifeGamemode.Server.Types;
namespace ReallifeGamemode.Server.Managers namespace ReallifeGamemode.Server.Managers
{ {