OverHaul Bus and Pilot TEST

This commit is contained in:
2021-04-10 01:32:12 +02:00
parent cb020aa007
commit b51756a045
14 changed files with 836 additions and 1336 deletions

View File

@@ -84,15 +84,15 @@ namespace ReallifeGamemode.Server.Job
player.SetData<float>("FareKm", km);
int targetId = player.GetData<int>("Passager");
if (targetId == 0) return;
using (var dbContext = new DatabaseContext())
{
if (player.HasData("hasPassager"))
{
User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault();
player.SendNotification("~r~[Info] ~w~ Dein Kunde hat kein Geld mehr auf der Hand.");
if((target.Handmoney - amount) <= 0)
player.SendNotification("~r~[Info] ~w~ Dein Kunde hat kein Geld mehr auf der Hand.");
if ((target.Handmoney - amount) <= 0)
{
Player targetmoney = PlayerService.GetPlayerByNameOrId(Convert.ToString(targetId));
targetmoney.SendNotification("~r~[Fehler] ~w~ Du hast kein Geld mehr auf der Hand.");
@@ -101,8 +101,8 @@ namespace ReallifeGamemode.Server.Job
targetmoney.TriggerEvent("CLIENT:cancelFareCustomer");
targetmoney.WarpOutOfVehicle();
}
else
{
else
{
target.Handmoney -= amount;
player.GetUser(dbContext).Wage += amount;
dbContext.SaveChanges();
@@ -123,11 +123,10 @@ namespace ReallifeGamemode.Server.Job
public static void UpdateFare()
{
foreach (var player in GetPlayerInJob())
{
User u = player.GetUser();
if(u == null)
if (u == null)
{
continue;
}
@@ -157,5 +156,26 @@ namespace ReallifeGamemode.Server.Job
}
}
}
public override void LastCheckpoint(Player player)
{
//nothing
}
public override void StartJobEndTimer(Player player)
{
//nothing
}
public override bool CheckVehicle(Player player, Vehicle vehicle)
{
if (!playerVehiclePair.ContainsKey(player))
return false;
if (playerVehiclePair[player] == vehicle)
return true;
return false;
}
}
}