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

More fixes

Browse Source
This commit is contained in:
Lukas Moungos
2019-07-20 13:27:03 +02:00
parent 2cfff8579a
commit 3b2918ecc2
4 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -5,6 +5,7 @@ using ReallifeGamemode.Server.Factions.Medic;
using ReallifeGamemode.Server.Models; using ReallifeGamemode.Server.Models;
using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Wanted; using ReallifeGamemode.Server.Wanted;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
@@ -248,14 +249,8 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
ChatService.SendMessage(target, "Deine Akte wurde von "+ player.Name + " gelöscht. Grund:" + reason); ChatService.SendMessage(target, "Deine Akte wurde von "+ player.Name + " gelöscht. Grund:" + reason);
foreach (var copPlayer in NAPI.Pools.GetAllPlayers()) ChatService.BroadcastFaction("~r~HQ: Die Akte von " + user.Name + " wurde von "+ player.Name +" gelöscht. Grund: " + reason + ".", new List<int>(){1, 3});
{
User copUser = copPlayer.GetUser();
if ((copUser.FactionId == 1 || copUser.FactionId == 3))
{
ChatService.SendMessage(copPlayer, "~r~HQ: Die Akte von " + user.Name + " wurde von "+ player.Name +" gelöscht. Grund: " + reason + ".");
}
}
targetUser.Wanteds = 0; targetUser.Wanteds = 0;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
@@ -291,14 +286,8 @@ namespace ReallifeGamemode.Server.Commands
{ {
Jail.Release_Jail(target, reason); Jail.Release_Jail(target, reason);
ChatService.SendMessage(target, "~r~Du wurdest von "+ player.Name +" aus dem Knast befreit"); ChatService.SendMessage(target, "~r~Du wurdest von "+ player.Name +" aus dem Knast befreit");
foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
{ ChatService.BroadcastFaction("~r~HQ: " + user.Name + " wurde von " + player.Name + " aus dem Knast entlassen. Grund: " + reason + ".", new List<int>() { 1, 3 });
User copUser = copPlayer.GetUser();
if ((copUser.FactionId == 1 || copUser.FactionId == 3))
{
ChatService.SendMessage(copPlayer, "~r~HQ: " + user.Name + " wurde von " + player.Name + " aus dem Knast entlassen. Grund: " + reason + ".");
}
}
} }
else else
{ {

2
ReallifeGamemode.Server/Extensions/ClientExtension.cs
View File

@@ -106,7 +106,7 @@ namespace ReallifeGamemode.Server.Extensions
foreach(var copPlayer in NAPI.Pools.GetAllPlayers()) foreach(var copPlayer in NAPI.Pools.GetAllPlayers())
{ {
User copUser = copPlayer.GetUser(); User copUser = copPlayer.GetUser();
if((copUser.FactionId == 1 || copUser.FactionId == 3) && cop != null) if(cop != null && (copUser.FactionId == 1 || copUser.FactionId == 3))
{ {
ChatService.SendMessage(copPlayer, "~r~HQ: Straftat gemeldet von " + cop.Name + " mit Fahndungslevel "+ amount +". Straftäter: "+ user.Name + "."); ChatService.SendMessage(copPlayer, "~r~HQ: Straftat gemeldet von " + cop.Name + " mit Fahndungslevel "+ amount +". Straftäter: "+ user.Name + ".");
ChatService.SendMessage(copPlayer, "~r~HQ: Grund: " + reason + "."); ChatService.SendMessage(copPlayer, "~r~HQ: Grund: " + reason + ".");

6
ReallifeGamemode.Server/Services/ChatService.cs
View File

@@ -3,6 +3,7 @@ using ReallifeGamemode.Server.Entities;
using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Job; using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Util;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -103,5 +104,10 @@ namespace ReallifeGamemode.Server.Services
{ {
job.GetUsersInJob().ForEach(c => ChatService.SendMessage(c, message)); job.GetUsersInJob().ForEach(c => ChatService.SendMessage(c, message));
} }
internal static void BroadcastFaction(string v, List<int> list)
{
throw new NotImplementedException();
}
} }
} }

10
ReallifeGamemode.Server/Wanted/Jail.cs
View File

@@ -74,14 +74,8 @@ namespace ReallifeGamemode.Server.Wanted
Medic.RemoveTaskFromList(task); Medic.RemoveTaskFromList(task);
client.Health = 100; client.Health = 100;
foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
{ ChatService.BroadcastFaction("~r~HQ: " + user.Name + " wurde im Gefängnis zugewiesen.", new List<int>() {1,3});
User copUser = copPlayer.GetUser();
if ((copUser.FactionId == 1 || copUser.FactionId == 3))
{
ChatService.SendMessage(copPlayer, "~r~HQ: " + user.Name + " wurde im Gefängnis zugewiesen.");
}
}
ChatService.SendMessage(client, "Du bist im Gefängnis für " + user.JailTime + " Sekunden."); ChatService.SendMessage(client, "Du bist im Gefängnis für " + user.JailTime + " Sekunden.");