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

hab sheise gebaut

Browse Source
This commit is contained in:
Luke
2020-08-02 17:10:15 +02:00
parent 61f96f2ab4
commit ae9b374b03
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Server/Job/JobBase.cs
View File

@@ -34,7 +34,7 @@ namespace ReallifeGamemode.Server.Job
_inJob.Add(player); _inJob.Add(player);
jobPlayer.Add(player); jobPlayer.Add(player);
ChatService.SendMessage(player, $"~y~Job:~s~ Du hast deinen Job (~o~{job.Name}~s~) gestartet."); ChatService.SendMessage(player, $"~y~Job:~s~ Du hast deinen Job (~o~{this.Name}~s~) gestartet.");
JobStart?.Invoke(player); JobStart?.Invoke(player);
} }
@@ -58,7 +58,7 @@ namespace ReallifeGamemode.Server.Job
if (quit) if (quit)
{ {
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~{this.Name}~s~) beendet.");
} }

14
ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
View File

@@ -7,6 +7,7 @@ using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Job namespace ReallifeGamemode.Server.Job
{ {
@@ -166,6 +167,7 @@ namespace ReallifeGamemode.Server.Job
{ {
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
veh = data.vehicle; veh = data.vehicle;
JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Du hast deinen Job (~o~{job.Name}~s~) gestartet."); ChatService.SendMessage((Player)player, $"~y~Job: ~s~Du hast deinen Job (~o~{job.Name}~s~) gestartet.");
player.TriggerEvent("SERVER:MuellmannStatusTrue"); player.TriggerEvent("SERVER:MuellmannStatusTrue");
player.TriggerEvent("SERVER:MuellmannBCSErstellen", JsonConvert.SerializeObject(vector3s.ToArray()), veh); player.TriggerEvent("SERVER:MuellmannBCSErstellen", JsonConvert.SerializeObject(vector3s.ToArray()), veh);
@@ -176,6 +178,7 @@ namespace ReallifeGamemode.Server.Job
public void MuellmannJobBeenden(Player player) public void MuellmannJobBeenden(Player player)
{ {
JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Du hast deinen Job (~o~{job.Name}~s~) beendet."); ChatService.SendMessage((Player)player, $"~y~Job: ~s~Du hast deinen Job (~o~{job.Name}~s~) beendet.");
player.TriggerEvent("SERVER:MuellmannStatusFalse"); player.TriggerEvent("SERVER:MuellmannStatusFalse");
player.TriggerEvent("SERVER:MuellmannBCSEntfernen"); player.TriggerEvent("SERVER:MuellmannBCSEntfernen");
@@ -209,7 +212,7 @@ namespace ReallifeGamemode.Server.Job
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
Player target = data.getPartnerClient(player); Player target = data.getPartnerClient(player);
if (target != null) target.TriggerEvent("MuellmannUpdateColshape", colshapeIndex); if (target != null) target.TriggerEvent("MuellmannUpdateColshape", colshapeIndex);
ChatService.SendMessage((Player)player, "~y~Job: ~s~Wirf den Müllsack in den Müllwagen."); player.TriggerEvent("renderTextOnScreen", "Wirf den Müllsack in den Müllwagen.");
player.AddAttachment("binbag", false); player.AddAttachment("binbag", false);
return; return;
} }
@@ -247,7 +250,7 @@ namespace ReallifeGamemode.Server.Job
{ {
ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!"); ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!");
if (target != null) { if (target != null) {
ChatService.SendMessage((Player)target, "~y~Job: ~s~Der Müllwagen ist voll! Er muss wieder entleert werden."); ChatService.SendMessage((Player)target, "~y~Job: ~s~Der Müllwagen ist voll! Er muss entleert werden.");
target.TriggerEvent("SERVER:MuellmannZuBase"); target.TriggerEvent("SERVER:MuellmannZuBase");
} }
player.TriggerEvent("SERVER:MuellmannZuBase"); player.TriggerEvent("SERVER:MuellmannZuBase");
@@ -269,8 +272,11 @@ namespace ReallifeGamemode.Server.Job
if (target != null) if (target != null)
if (player.GetUser().trashcount >= 20) if (player.GetUser().trashcount >= 20)
{ {
ChatService.SendMessage((Player)player, "Auto ist voll fahre nun zu Base."); ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!");
if (target != null) { ChatService.SendMessage((Player)target, "Auto ist voll fahre nun zu Base."); target.TriggerEvent("SERVER:MuellmannZuBase"); } if (target != null) {
ChatService.SendMessage((Player)target, "~y~Job: ~s~Der Müllwagen ist voll! Er muss entleert werden.");
target.TriggerEvent("SERVER:MuellmannZuBase");
}
player.TriggerEvent("SERVER:MuellmannZuBase"); player.TriggerEvent("SERVER:MuellmannZuBase");
} }
else else