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

try some fixes Taxidriver

Browse Source
This commit is contained in:
Michael
2020-10-01 15:48:50 +02:00
parent f58a30f118
commit aeb0601d34
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReallifeGamemode.Server/Events/Death.cs
View File

@@ -198,6 +198,11 @@ namespace ReallifeGamemode.Server.Events
//ChatService.SendMessage(player, "Debug7"); //ChatService.SendMessage(player, "Debug7");
player.ResetData("PilotenBase"); player.ResetData("PilotenBase");
job.StopJob(player); job.StopJob(player);
if(player.HasData("Passager"))
{
player.TriggerEvent("CLIENT:stopFare");
player.WarpOutOfVehicle();
}
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet."); ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
if (player.GetData<bool>("HatRoute") == true) if (player.GetData<bool>("HatRoute") == true)
{ {

8
ReallifeGamemode.Server/Job/BusDriverJob.cs
View File

@@ -497,14 +497,6 @@ namespace ReallifeGamemode.Server.Job
CheckPointHandle.DeleteCheckpoints(player); CheckPointHandle.DeleteCheckpoints(player);
if (!player.HasData("isDead") || player.GetData<bool>("isDead") == false) if (!player.HasData("isDead") || player.GetData<bool>("isDead") == false)
{ {
if (player.GetUser().JobId == 1)//Taxifahrer
{
//VehicleManager.DeleteVehicle(v);
}
if (player.GetUser().JobId == 2)//Müllmann
{
//VehicleManager.DeleteVehicle(v);
}
if (player.GetUser().JobId == 3)//Pilot if (player.GetUser().JobId == 3)//Pilot
{ {
if (!player.HasData("PilotenBase") || player.GetData<int>("PilotenBase") == 1) //Sandyshores if (!player.HasData("PilotenBase") || player.GetData<int>("PilotenBase") == 1) //Sandyshores

20
ReallifeGamemode.Server/Job/TaxiDriverJob.cs
View File

@@ -81,14 +81,28 @@ namespace ReallifeGamemode.Server.Job
player.SetData<float>("FareKm", km); player.SetData<float>("FareKm", km);
int targetId = player.GetData<int>("Passager"); int targetId = player.GetData<int>("Passager");
if (targetId == 0) return; if (targetId == 0) return;
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
if (player.HasData("hasPassager")) if (player.HasData("hasPassager"))
{ {
User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault(); User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault();
target.Handmoney -= amount; if(target.Handmoney <= 0)
player.GetUser(dbContext).Wage += amount; {
dbContext.SaveChanges(); player.SetData<bool>("hasPassager", false);
player.SendNotification("~r~[Info] ~w~ Dein Kunde hat kein Geld mehr auf der Hand.");
if(player.HasData("Passager"))
{
player.SendNotification("~r~[Info] ~w~ Du hast kein Geld mehr auf der Hand.");
player.TriggerEvent("CLIENT:stopFare");
player.WarpOutOfVehicle();
}
}
else {
target.Handmoney -= amount;
player.GetUser(dbContext).Wage += amount;
dbContext.SaveChanges();
}
//target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney); //target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney);
} }
} }