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

finish müllmann :*

Browse Source
This commit is contained in:
Michael
2020-06-30 21:09:56 +02:00
parent ec898c8a5d
commit 3c5cf9cd95
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using GTANetworkAPI; using GTANetworkAPI;
using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Extensions;
namespace ReallifeGamemode.Server.Job namespace ReallifeGamemode.Server.Job
{ {
@@ -43,11 +45,24 @@ namespace ReallifeGamemode.Server.Job
_inJob.Remove(player); _inJob.Remove(player);
jobPlayer.Remove(player); jobPlayer.Remove(player);
User user = player.GetUser();
using (var dbContext = new DatabaseContext())
{
user = player.GetUser(dbContext);
user.trashcount -= user.trashcount;
dbContext.SaveChanges();
}
if (quit) if (quit)
{ {
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{this.Name}~s~ beendet."); ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{this.Name}~s~ beendet.");
} }
JobStop?.Invoke(player); JobStop?.Invoke(player);
} }

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

@@ -213,12 +213,10 @@ namespace ReallifeGamemode.Server.Job
[RemoteEvent("CLIENT:MuellmannAddSack")] [RemoteEvent("CLIENT:MuellmannAddSack")]
public void MuellmannAddSack(Player player) public void MuellmannAddSack(Player player)
{ {
foreach (var data in muellmanData) foreach (var data in muellmanData)
{ {
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
Player target = data.getPartnerClient(player); Player target = data.getPartnerClient(player);
data.setTrashCount(data.getTrashCount() + 1);
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())
@@ -232,9 +230,7 @@ namespace ReallifeGamemode.Server.Job
} }
player.AddAttachment("binbag", true); player.AddAttachment("binbag", true);
if (target != null) if (target != null)
ChatService.SendMessage((Player)target, $"Du hast soviele Säcke: {target.GetUser().trashcount}"); if (player.GetUser().trashcount >= 20)
ChatService.SendMessage((Player)player, $"Du hast soviele Säcke: {player.GetUser().trashcount}");
if (player.GetUser().trashcount >= 5)
{ {
ChatService.SendMessage((Player)player, "Auto ist voll fahre nun zu Base."); ChatService.SendMessage((Player)player, "Auto ist voll fahre nun zu Base.");
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, "Auto ist voll fahre nun zu Base."); target.TriggerEvent("SERVER:MuellmannZuBase"); }
@@ -286,9 +282,9 @@ namespace ReallifeGamemode.Server.Job
user1 = player.GetUser(dbContext); user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext); user2 = target.GetUser(dbContext);
user1.trashcount -= 5; user1.trashcount -= user1.trashcount;
if (target != null) if (target != null)
user2.trashcount -= 5; user2.trashcount -= user2.trashcount;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData().Count} | Säcke: {data.getTrashCount()}"); Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData().Count} | Säcke: {data.getTrashCount()}");