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

fixed conflicts in jobroutes

Browse Source
This commit is contained in:
Fabian Fabian
2019-09-16 22:59:18 +02:00
parent a86726e4c1
commit 2cebda5e1a
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Client/util/checkpoint.ts
View File

@@ -36,7 +36,9 @@ export default function checkpointHandle(globalData: GlobalData) {
if (dist <= 2) { if (dist <= 2) {
if (!inCheckpoint) { if (!inCheckpoint) {
mp.gui.chat.push("Warte nun " + delay / 1000 + " Sekunden"); if (delay != 0) {
mp.gui.chat.push("Warte nun " + delay / 1000 + " Sekunden");
}
mp.game.audio.playSoundFrontend(1, "Beep_Red", "DLC_HEIST_HACKING_SNAKE_SOUNDS", true); mp.game.audio.playSoundFrontend(1, "Beep_Red", "DLC_HEIST_HACKING_SNAKE_SOUNDS", true);
} }
inCheckpoint = true; inCheckpoint = true;

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

@@ -48,6 +48,8 @@ namespace ReallifeGamemode.Server.Events
ChatService.BroadcastAdmin("!{#FFFF00}*** " + player.Name + " hat den Server verlassen", AdminLevel.TEAM); ChatService.BroadcastAdmin("!{#FFFF00}*** " + player.Name + " hat den Server verlassen", AdminLevel.TEAM);
} }
CheckPointHandle.RemovePlayerHandlerFromList(player);
JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1); JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
if (job != null) job.StopJob(player, true); if (job != null) job.StopJob(player, true);

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

@@ -49,7 +49,7 @@ namespace ReallifeGamemode.Server.Job
new Vector3(459.6921,116.3203,98.18157), new Vector3(459.6921,116.3203,98.18157),
new Vector3(173.9451,220.1987,105.4178), new Vector3(173.9451,220.1987,105.4178),
new Vector3(-327.3175,261.2248,85.86708), new Vector3(-327.3175,261.2248,85.86708),
new Vector3(-764.2745,294.4415,8500808), new Vector3(-764.2745,294.4415,85.00808),
new Vector3(-1031.586,107.9002,52.30307), new Vector3(-1031.586,107.9002,52.30307),
new Vector3(-489.973,-195.4356,36.59651), new Vector3(-489.973,-195.4356,36.59651),
new Vector3(-224.4042,-528.0254,34.08064), new Vector3(-224.4042,-528.0254,34.08064),