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

Only send taxi enter message when veh driver is not contract driver

Browse Source
This commit is contained in:
hydrant
2019-06-23 19:50:32 +02:00
parent 777eb6fc01
commit d728252008
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Server/Extensions/VehicleExtension.cs
View File

@@ -4,6 +4,7 @@ using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
namespace ReallifeGamemode.Server.Extensions namespace ReallifeGamemode.Server.Extensions
@@ -14,5 +15,10 @@ namespace ReallifeGamemode.Server.Extensions
{ {
return VehicleManager.GetServerVehicleFromVehicle(veh, context); return VehicleManager.GetServerVehicleFromVehicle(veh, context);
} }
public static Client GetDriver(this Vehicle veh)
{
return NAPI.Pools.GetAllPlayers().Where(p => p.Vehicle.Handle == veh.Handle && p.VehicleSeat == -1).FirstOrDefault();
}
} }
} }

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

@@ -231,10 +231,13 @@ namespace ReallifeGamemode.Server.Managers
var contract = taxiContracts.First(); var contract = taxiContracts.First();
taxiJob.TaxiContracts.Remove(contract); taxiJob.TaxiContracts.Remove(contract);
if(contract.Driver.Handle != veh.GetDriver().Handle)
{
ChatService.SendMessage(contract.Driver, $"!{{02FCFF}}{player.Name} ist in ein Taxi eingestiegen, der Auftrag wurde beendet."); ChatService.SendMessage(contract.Driver, $"!{{02FCFF}}{player.Name} ist in ein Taxi eingestiegen, der Auftrag wurde beendet.");
ChatService.SendMessage(player, $"!{{02FCFF}}Du bist in ein Taxi eingestiegen, der Auftrag wurde beendet."); ChatService.SendMessage(player, $"!{{02FCFF}}Du bist in ein Taxi eingestiegen, der Auftrag wurde beendet.");
} }
} }
}
[RemoteEvent("CLIENT:JobManager_TaxiJob_AcceptCall")] [RemoteEvent("CLIENT:JobManager_TaxiJob_AcceptCall")]
public void TaxiJobAcceptCall(Client player, string name) public void TaxiJobAcceptCall(Client player, string name)