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

Merge branch 'develop' into 'luke-develop-patch-56806'

Browse Source 
# Conflicts:
#   ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
This commit is contained in:
Luke
2020-08-02 16:49:50 +02:00
parent 973d4df926 48c92ddfa0
commit 6a855a69e5
9 changed files with 2006 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,6 +199,11 @@ namespace ReallifeGamemode.Server.Job
[RemoteEvent("CLIENT:MuellmannImShape")]
public void MuellmannImShape(Player player, int colshapeIndex)
{
if (player.IsInVehicle)
{
return;
}
foreach (var data in muellmanData)
{
if (data.getDataFromClient(player) == null) continue;
@@ -212,7 +217,12 @@ namespace ReallifeGamemode.Server.Job
[RemoteEvent("CLIENT:MuellmannAddSack")]
public void MuellmannAddSack(Player player)
{
{
if (player.IsInVehicle)
{
return;
}
foreach (var data in muellmanData)
{
if (data.getDataFromClient(player) == null) continue;
@@ -244,17 +254,38 @@ namespace ReallifeGamemode.Server.Job
}
else
{
user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext);
user1.trashcount += 1;
player.SendNotification("Müllsack: " + user1.trashcount + " von 20.");
if (target != null)
{
player.GetUser().Wage += 10;
target.GetUser().Wage += 10;
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, "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"); }
player.TriggerEvent("SERVER:MuellmannZuBase");
}
else
{
player.GetUser().Wage += 20;
if (target != null)
{
player.GetUser().Wage += 10;
target.GetUser().Wage += 10;
}
else
{
player.GetUser().Wage += 20;
}
}
}
return;
}
}
@@ -281,18 +312,18 @@ namespace ReallifeGamemode.Server.Job
{
player.GetUser().Wage += 200;
}
User user1 = player.GetUser();
User user2 = target.GetUser();
using (var dbContext = new DatabaseContext())
{
User user1 = player.GetUser();
User user2 = target.GetUser();
using (var dbContext = new DatabaseContext())
{
user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext);
user1.trashcount -= user1.trashcount;
if (target != null)
user2.trashcount -= user2.trashcount;
dbContext.SaveChanges();
}
user2.trashcount -= user2.trashcount;
dbContext.SaveChanges();
}
Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData().Count} | Säcke: {data.getTrashCount()}");
return;
}