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

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
VegaZ
2021-04-01 22:44:08 +02:00
parent 4079b4bd3c ba5f34449c
commit 21a9a4b995
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -475,7 +475,7 @@ namespace ReallifeGamemode.Server.Commands
#endregion Staatsfraktionen (LSPD / FBI) Commands
#region Weazel News
[Command("eventchat", "~m~Benutzung: ~s~/eventchat [Typ = ~g~on~s~, ~g~off~s~", GreedyArg = true)]
[Command("eventchat", "~m~Benutzung: ~s~/eventchat [Typ = ~g~on~s~, ~g~off~s~]", GreedyArg = true)]
public void CmdFactionNREventchat(Player player, string onoff)
{

2
ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -88,7 +88,7 @@ namespace ReallifeGamemode.Server.Commands
player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable));
}
[Command("event", "~m~Benutzung: ~s~/eventchat [Nachricht]", GreedyArg = true)]
[Command("event", "~m~Benutzung: ~s~/event [Nachricht]", GreedyArg = true)]
public void CmdFactionNREventchat(Player player, string msg)
{
if (player.HasData("eventAllowed") == false)

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

@@ -206,7 +206,7 @@ namespace ReallifeGamemode.Server.Wanted
if (user.JailTime <= 0)
{
Jailtime.Remove(user.Id);
player.Position = new Vector3(461.7256, -988.6035, 24.91487);
player.Position = new Vector3(427.879, -984.65, 30.71);
player.TriggerEvent("jailTime", 0);
return;
}
@@ -273,7 +273,7 @@ namespace ReallifeGamemode.Server.Wanted
dbContext.SaveChanges();
}
target.Health = 100;
target.Position = new Vector3(461.7256, -988.6035, 24.91487);
target.Position = new Vector3(427.879, -984.65, 30.71);
ChatService.HQMessage(" Admin " + admin.Name + " hat " + user.Name + " aus dem Knast entlassen.");
ChatService.SendMessage(target, "!{#8181E9}Admin " + admin.Name + " hat dich aus dem Knast entlassen");