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

müllmann kein driveby

Browse Source
This commit is contained in:
hydrant
2020-08-02 16:42:34 +02:00
parent eaf82cbaec
commit c8cc3b1321
1 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,6 +199,11 @@ namespace ReallifeGamemode.Server.Job
[RemoteEvent("CLIENT:MuellmannImShape")] [RemoteEvent("CLIENT:MuellmannImShape")]
public void MuellmannImShape(Player player, int colshapeIndex) public void MuellmannImShape(Player player, int colshapeIndex)
{ {
if (player.IsInVehicle)
{
return;
}
foreach (var data in muellmanData) foreach (var data in muellmanData)
{ {
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
@@ -213,45 +218,51 @@ namespace ReallifeGamemode.Server.Job
[RemoteEvent("CLIENT:MuellmannAddSack")] [RemoteEvent("CLIENT:MuellmannAddSack")]
public void MuellmannAddSack(Player player) public void MuellmannAddSack(Player player)
{ {
if (player.IsInVehicle)
{
return;
}
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);
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, "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
{ {
user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext);
user1.trashcount += 1;
player.SendNotification("Müllsack: " + user1.trashcount + " von 20.");
if (target != null) if (target != null)
{ {
player.GetUser().Wage += 10; target.SendNotification("Müllsack: " + user2.trashcount + " von 20.");
target.GetUser().Wage += 10; 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 else
{ {
player.GetUser().Wage += 20; if (target != null)
{
player.GetUser().Wage += 10;
target.GetUser().Wage += 10;
}
else
{
player.GetUser().Wage += 20;
}
} }
}
return; return;
} }
} }
@@ -278,18 +289,18 @@ namespace ReallifeGamemode.Server.Job
{ {
player.GetUser().Wage += 200; player.GetUser().Wage += 200;
} }
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); user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext); user2 = target.GetUser(dbContext);
user1.trashcount -= user1.trashcount; user1.trashcount -= user1.trashcount;
if (target != null) if (target != null)
user2.trashcount -= user2.trashcount; 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()}");
return; return;
} }