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

Try Fix Disconnect+Death

Browse Source
This commit is contained in:
Mac_Slash
2020-05-04 17:03:57 +02:00
parent 10129fde42
commit 049ea304f0
3 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -749,8 +749,8 @@ namespace ReallifeGamemode.Server.Commands
ChatService.SendMessage(player, "IP von ~y~" + NAPI.Player.GetPlayerName(target) + ": ~g~" + target.Address); ChatService.SendMessage(player, "IP von ~y~" + NAPI.Player.GetPlayerName(target) + ": ~g~" + target.Address);
} }
[Command("ban", "~m~Benutzung: ~s~/ban [User] [Zeit in Minuten(0 für Permanent)] [Grund] ", GreedyArg = true)] [Command("ban", "~m~Benutzung: ~s~/ban [User] [Grund] [Zeit in Minuten(0 für Permanent)]", GreedyArg = true)]
public void CmdAdminBan(Player admin, string user, int mins, string reason) public void CmdAdminBan(Player admin, string user, string reason, int mins = 0)
{ {
if (!admin.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) if (!admin.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{ {
@@ -862,7 +862,7 @@ namespace ReallifeGamemode.Server.Commands
player.TriggerEvent("CLIENT:AddPed", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension); player.TriggerEvent("CLIENT:AddPed", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension);
//NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension); //NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension);
} }
[Command("addgped", "~m~Benutzung: ~s~/addgped [model] [dimension]")] [Command("addgped", "~m~Benutzung: ~s~/addgped")]
public void CmdAdminAddGPed(Player player, int model, uint dimension = 0) public void CmdAdminAddGPed(Player player, int model, uint dimension = 0)
{ {
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
@@ -872,6 +872,7 @@ namespace ReallifeGamemode.Server.Commands
} }
//player.TriggerEvent("CLIENT:AddPed", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension); //player.TriggerEvent("CLIENT:AddPed", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension);
Ped Peter = NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension); Ped Peter = NAPI.Ped.CreatePed(PedHash.Bankman, new Vector3(player.Position.X, player.Position.Y, player.Position.Z), player.Heading, dimension);
//Peter.freezePosition(true);
} }
[Command("setskill", "~m~Benutzung: ~s~/setskill [Playerid] [Bus/Pilot] [Menge]")] [Command("setskill", "~m~Benutzung: ~s~/setskill [Playerid] [Bus/Pilot] [Menge]")]
public void CmdAdminSetSkill(Player player, string name, string Skill, int SkillLevel) public void CmdAdminSetSkill(Player player, string name, string Skill, int SkillLevel)

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

@@ -114,12 +114,12 @@ namespace ReallifeGamemode.Server.Events
} }
Job.JobBase job = Managers.JobManager.GetJob(player.GetUser().JobId ?? -1); Job.JobBase job = Managers.JobManager.GetJob(player.GetUser().JobId ?? -1);
if (job != null) if (job != null)
{ {
if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ) if (job.GetUsersInJob().Contains(player))
{ {
if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true) if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
{ {
if (vehJ.GetJob().GetUsersInJob().Contains(player)) if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true)
{ {
if (player.Vehicle != null) if (player.Vehicle != null)
{ {
@@ -129,17 +129,17 @@ namespace ReallifeGamemode.Server.Events
} }
} }
} }
Managers.JobManager jm = new Managers.JobManager();
if (jm.playerTimersJobVehicleRespawn.ContainsKey(player))
{
jm.playerTimersJobVehicleRespawn[player].Stop();
}
player.ResetData("HatRoute");
player.ResetData("PilotenBase");
job.StopJob(player);
//ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
CheckPointHandle.DeleteCheckpoints(player);
} }
Managers.JobManager jm = new Managers.JobManager();
if (jm.playerTimersJobVehicleRespawn.ContainsKey(player))
{
jm.playerTimersJobVehicleRespawn[player].Stop();
}
player.ResetData("HatRoute");
player.ResetData("PilotenBase");
job.StopJob(player);
//ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
CheckPointHandle.DeleteCheckpoints(player);
} }
//JailTime.cs //JailTime.cs

28
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -58,11 +58,11 @@ namespace ReallifeGamemode.Server.Events
JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1); JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
if (job != null) if (job != null)
{ {
if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ) if (job.GetUsersInJob().Contains(player))
{ {
if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true) if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
{ {
if (vehJ.GetJob().GetUsersInJob().Contains(player)) if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true)
{ {
if (player.Vehicle != null) if (player.Vehicle != null)
{ {
@@ -72,18 +72,18 @@ namespace ReallifeGamemode.Server.Events
} }
} }
} }
JobManager jm = new JobManager();
if (jm.playerTimersJobVehicleRespawn.ContainsKey(player))
{
jm.playerTimersJobVehicleRespawn[player].Stop();
}
player.ResetData("HatRoute");
player.ResetData("PilotenBase");
player.ResetData("JobVehicleFrei");
job.StopJob(player);
//ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
CheckPointHandle.DeleteCheckpoints(player);
} }
JobManager jm = new JobManager();
if (jm.playerTimersJobVehicleRespawn.ContainsKey(player))
{
jm.playerTimersJobVehicleRespawn[player].Stop();
}
player.ResetData("HatRoute");
player.ResetData("PilotenBase");
player.ResetData("JobVehicleFrei");
job.StopJob(player);
//ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
CheckPointHandle.DeleteCheckpoints(player);
} }
using (var saveUser = new DatabaseContext()) using (var saveUser = new DatabaseContext())