From bfb539a6c3b8a432359c54139977a0e251476cf3 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 Apr 2021 19:30:38 +0200 Subject: [PATCH 1/9] vllt fix report system, auch wenn das keine fehler hat --- ReallifeGamemode.Server/Events/Disconnect.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 0aabb128..060305e5 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -61,14 +61,14 @@ namespace ReallifeGamemode.Server.Events } } */ - var listReports = Report.Report.listReports; + ReportManage temp; - for (int a = 0; a < listReports.Count; a++) + for (int a = 0; a < Report.Report.listReports.Count; a++) { - temp = listReports[a]; + temp = Report.Report.listReports[a]; if (temp.getAdmin().Equals(player.Name)) { - listReports.Remove(temp); + Report.Report.listReports.Remove(temp); Player user = PlayerService.GetPlayerByNameOrId(temp.getUser()); user.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der Admin hat den Server verlassen"); @@ -77,7 +77,7 @@ namespace ReallifeGamemode.Server.Events if (temp.getUser().Equals(player.Name)) { - listReports.Remove(temp); + Report.Report.listReports.Remove(temp); Player admin = PlayerService.GetPlayerByNameOrId(temp.getAdmin()); admin.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der User hat den Server verlassen"); From fb647e1274045556feb2b27db9708cca869f8362 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 Apr 2021 19:38:17 +0200 Subject: [PATCH 2/9] tst --- ReallifeGamemode.Server/Events/Disconnect.cs | 27 ++++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 060305e5..00e16acc 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -48,7 +48,11 @@ namespace ReallifeGamemode.Server.Events { GlobalHelper.DutyAdmins.Remove(player); }*/ - + + if (player.GetUser().IsAdmin(AdminLevel.MAPPING)) + { + ChatService.BroadcastAdmin("!{#FFFF00}*** " + player.Name + " hat den Server verlassen", AdminLevel.MAPPING); + } /* TaxiDriverJob taxiJob = JobManager.GetJob(); TaxiContract taxiContract = taxiJob.TaxiContracts.Where(t => t.Name == player.Name).FirstOrDefault(); @@ -61,14 +65,14 @@ namespace ReallifeGamemode.Server.Events } } */ - + var listReports = Report.Report.listReports; ReportManage temp; - for (int a = 0; a < Report.Report.listReports.Count; a++) + for (int a = 0; a < listReports.Count; a++) { - temp = Report.Report.listReports[a]; + temp = listReports[a]; if (temp.getAdmin().Equals(player.Name)) { - Report.Report.listReports.Remove(temp); + listReports.Remove(temp); Player user = PlayerService.GetPlayerByNameOrId(temp.getUser()); user.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der Admin hat den Server verlassen"); @@ -77,7 +81,7 @@ namespace ReallifeGamemode.Server.Events if (temp.getUser().Equals(player.Name)) { - Report.Report.listReports.Remove(temp); + listReports.Remove(temp); Player admin = PlayerService.GetPlayerByNameOrId(temp.getAdmin()); admin.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der User hat den Server verlassen"); @@ -128,18 +132,7 @@ namespace ReallifeGamemode.Server.Events user.PositionZ = pos.Z; saveUser.SaveChanges(); user.Dead = player.HasData("isDead") ? (bool)player.GetData("isDead") : false; - - if (user.IsAdmin(AdminLevel.MAPPING)) - { - ChatService.BroadcastAdmin("!{#FFFF00}*** " + player.Name + " hat den Server verlassen", AdminLevel.MAPPING); - } - - if (user.Wanteds > 0) - { - ChatService.HQMessage("!{#FFFF00}** Der Straftäter " + player.GetUser().Name + " ist vom Radar verschwunden"); - } } - player.SetData("isLoggedIn", false); player.TriggerEvent("CLIENT:DestroyPed", 1); player.TriggerEvent("CLIENT:DestroyPed", 2); From 9ef406e6734f3b08270098b8898125936ef6bc8c Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 Apr 2021 19:41:13 +0200 Subject: [PATCH 3/9] tst --- ReallifeGamemode.Server/Events/Disconnect.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 00e16acc..79acc3c6 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -65,14 +65,13 @@ namespace ReallifeGamemode.Server.Events } } */ - var listReports = Report.Report.listReports; ReportManage temp; - for (int a = 0; a < listReports.Count; a++) + for (int a = 0; a < Report.Report.listReports.Count; a++) { - temp = listReports[a]; + temp = Report.Report.listReports[a]; if (temp.getAdmin().Equals(player.Name)) { - listReports.Remove(temp); + Report.Report.listReports.Remove(temp); Player user = PlayerService.GetPlayerByNameOrId(temp.getUser()); user.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der Admin hat den Server verlassen"); @@ -81,7 +80,7 @@ namespace ReallifeGamemode.Server.Events if (temp.getUser().Equals(player.Name)) { - listReports.Remove(temp); + Report.Report.listReports.Remove(temp); Player admin = PlayerService.GetPlayerByNameOrId(temp.getAdmin()); admin.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der User hat den Server verlassen"); From 152a49231d04abc00c089f95ef958b500d1177d4 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 Apr 2021 19:44:08 +0200 Subject: [PATCH 4/9] tst --- ReallifeGamemode.Server/Events/Disconnect.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 79acc3c6..218fb269 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -69,6 +69,12 @@ namespace ReallifeGamemode.Server.Events for (int a = 0; a < Report.Report.listReports.Count; a++) { temp = Report.Report.listReports[a]; + + if (!temp.isAssigned()) + { + continue; + } + if (temp.getAdmin().Equals(player.Name)) { Report.Report.listReports.Remove(temp); From c732d0887b1eaf4e1cbfafb6c11efda79ecaeae8 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 Apr 2021 19:54:04 +0200 Subject: [PATCH 5/9] test --- ReallifeGamemode.Server/Events/Disconnect.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 218fb269..4465ba1d 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -70,11 +70,6 @@ namespace ReallifeGamemode.Server.Events { temp = Report.Report.listReports[a]; - if (!temp.isAssigned()) - { - continue; - } - if (temp.getAdmin().Equals(player.Name)) { Report.Report.listReports.Remove(temp); @@ -86,10 +81,12 @@ namespace ReallifeGamemode.Server.Events if (temp.getUser().Equals(player.Name)) { - Report.Report.listReports.Remove(temp); - Player admin = PlayerService.GetPlayerByNameOrId(temp.getAdmin()); - admin.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der User hat den Server verlassen"); + if (admin != null) + { + admin.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der User hat den Server verlassen"); + Report.Report.listReports.Remove(temp); + } break; } } From 6730bb049eaea6e75fd0f916e51239a22889fcf4 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 Apr 2021 19:59:54 +0200 Subject: [PATCH 6/9] fix juhuu --- ReallifeGamemode.Server/Events/Disconnect.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 4465ba1d..6b502572 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -85,8 +85,8 @@ namespace ReallifeGamemode.Server.Events if (admin != null) { admin.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der User hat den Server verlassen"); - Report.Report.listReports.Remove(temp); } + Report.Report.listReports.Remove(temp); break; } } From 5d207d22e49e4838ec02eebceefd7ccf1cf459b9 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 Apr 2021 20:01:17 +0200 Subject: [PATCH 7/9] fix report wenn user offline geht --- ReallifeGamemode.Server/Events/Disconnect.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 00e16acc..6b502572 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -65,14 +65,14 @@ namespace ReallifeGamemode.Server.Events } } */ - var listReports = Report.Report.listReports; ReportManage temp; - for (int a = 0; a < listReports.Count; a++) + for (int a = 0; a < Report.Report.listReports.Count; a++) { - temp = listReports[a]; + temp = Report.Report.listReports[a]; + if (temp.getAdmin().Equals(player.Name)) { - listReports.Remove(temp); + Report.Report.listReports.Remove(temp); Player user = PlayerService.GetPlayerByNameOrId(temp.getUser()); user.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der Admin hat den Server verlassen"); @@ -81,10 +81,12 @@ namespace ReallifeGamemode.Server.Events if (temp.getUser().Equals(player.Name)) { - listReports.Remove(temp); - Player admin = PlayerService.GetPlayerByNameOrId(temp.getAdmin()); - admin.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der User hat den Server verlassen"); + if (admin != null) + { + admin.SendChatMessage("!{#008fff}[REPORT]!{#FFFFFF} Chat beendet. Der User hat den Server verlassen"); + } + Report.Report.listReports.Remove(temp); break; } } From 9f3aee57c1a7780a39d45ad169cc6358f73a30ce Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 Apr 2021 20:20:21 +0200 Subject: [PATCH 8/9] rechtschreibfehler --- ReallifeGamemode.Server/Events/Disconnect.cs | 6 ++++++ ReallifeGamemode.Server/Events/Login.cs | 2 +- ReallifeGamemode.Server/Extensions/ClientExtension.cs | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 6b502572..264812cd 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -134,6 +134,12 @@ namespace ReallifeGamemode.Server.Events user.PositionZ = pos.Z; saveUser.SaveChanges(); user.Dead = player.HasData("isDead") ? (bool)player.GetData("isDead") : false; + + if (user.Wanteds > 0) + { + ChatService.HQMessage("Der Straftäter " + player.GetUser().Name + " ist vom Radar verschwunden"); + } + } player.SetData("isLoggedIn", false); player.TriggerEvent("CLIENT:DestroyPed", 1); diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs index 4e768976..2c4d7f1e 100644 --- a/ReallifeGamemode.Server/Events/Login.cs +++ b/ReallifeGamemode.Server/Events/Login.cs @@ -83,7 +83,7 @@ namespace ReallifeGamemode.Server.Events if (user.Wanteds > 0) { - ChatService.HQMessage("!{#FFFF00}** Der Straftäter" + user.Name + " hat sich mit " + user.Wanteds + " Wanteds eingeloggt."); + ChatService.HQMessage("Der Straftäter" + user.Name + " hat sich mit " + user.Wanteds + " Wanteds eingeloggt."); } if (user.Group != null) diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index e20a998e..3853d13b 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -179,7 +179,7 @@ namespace ReallifeGamemode.Server.Extensions dbContext.SaveChanges(); } ChatService.SendMessage(user.Player, "!{#FF614A}Du hast ein Verbrechen begangen: " + reason + "" + (cop != null ? " | Gemeldet von: " + cop.Name + "." : "")); - ChatService.SendMessage(user.Player, " !{#FFFF00}Fahnundgslevel:~s~ " + newWanteds); + ChatService.SendMessage(user.Player, " !{#FFFF00}Fahndungslevel:~s~ " + newWanteds); foreach (var copPlayer in NAPI.Pools.GetAllPlayers()) { From 739faa92854caf7b38bb7a9fdcc51f946786b800 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 8 Apr 2021 20:25:09 +0200 Subject: [PATCH 9/9] hqmessage wenn wanteds komplett abgetaucht --- ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs b/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs index a9640a8b..ab02d365 100644 --- a/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs +++ b/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs @@ -9,6 +9,7 @@ using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Services; namespace ReallifeGamemode.Server.Wanted { @@ -68,10 +69,11 @@ namespace ReallifeGamemode.Server.Wanted if (waTimer[user.Id] <= 0) { ResetWantedTimeToElapse(player); - player.SendChatMessage("~y~Du hast erfolgtreich einen Wanted abgetaucht."); + player.SendChatMessage("~y~Du hast erfolgreich einen Wanted abgetaucht."); user.Wanteds -= 1; if (user.Wanteds == 0) { + ChatService.HQMessage(player.Name + " konnte solange abtauchen, sodass er nicht mehr gesucht wird."); user.SetBlipAndNametagColor(); dbContext.SaveChanges(); }