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

fix lukes sheise

Browse Source
This commit is contained in:
hydrant
2020-08-02 17:22:24 +02:00
parent 776bab88e6
commit e233575afa
2 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using GTANetworkAPI; using GTANetworkAPI;
@@ -230,32 +230,9 @@ 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);
User user1 = player.GetUser(); User user1 = player.GetUser();
User user2 = target.GetUser(); User user2 = target.GetUser();
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{
user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext);
user1.trashcount += 1;
player.SendNotification("Müllsack: " + user1.trashcount + " von 20.");
if (target != null) {
target.SendNotification("Müllsack: " + user2.trashcount + " von 20.");
user2.trashcount += 1;
}
dbContext.SaveChanges();
}
player.AddAttachment("binbag", true);
if (target != null)
if (player.GetUser().trashcount >= 20)
{
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, "~y~Job: ~s~Der Müllwagen ist voll! Er muss entleert werden.");
target.TriggerEvent("SERVER:MuellmannZuBase");
}
player.TriggerEvent("SERVER:MuellmannZuBase");
}
else
{ {
user1 = player.GetUser(dbContext); user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext); user2 = target.GetUser(dbContext);
@@ -273,7 +250,36 @@ namespace ReallifeGamemode.Server.Job
if (player.GetUser().trashcount >= 20) if (player.GetUser().trashcount >= 20)
{ {
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 entleert werden.");
target.TriggerEvent("SERVER:MuellmannZuBase");
}
player.TriggerEvent("SERVER:MuellmannZuBase");
}
else
{
using (var dbContext = new DatabaseContext())
{
user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext);
user1.trashcount += 1;
player.SendNotification("Müllsack: " + user1.trashcount + " von 20.");
if (target != null)
{
target.SendNotification("Müllsack: " + user2.trashcount + " von 20.");
user2.trashcount += 1;
}
dbContext.SaveChanges();
}
}
player.AddAttachment("binbag", true);
if (target != null)
if (player.GetUser().trashcount >= 20)
{
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, "~y~Job: ~s~Der Müllwagen ist voll! Er muss 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");
} }

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

@@ -322,6 +322,7 @@ namespace ReallifeGamemode.Server.Managers
} }
}); });
} }
[RemoteEvent("CLIENT:Job_StopJob")] [RemoteEvent("CLIENT:Job_StopJob")]
public void StopJob(Player player) public void StopJob(Player player)
{ {