diff --git a/ReallifeGamemode.Server/Report/Report.cs b/ReallifeGamemode.Server/Report/Report.cs index 41089792..0d4682bf 100644 --- a/ReallifeGamemode.Server/Report/Report.cs +++ b/ReallifeGamemode.Server/Report/Report.cs @@ -61,7 +61,6 @@ namespace ReallifeGamemode.Server.Report if (listPlayers.Count == 0 || listTicketnames.Count == 0) { - client.SendChatMessage("Irgendwas ist schief gelaufen"); return; } client.TriggerEvent("showReportMenu", JsonConvert.SerializeObject(listPlayers), JsonConvert.SerializeObject(listTicketnames)); @@ -76,9 +75,6 @@ namespace ReallifeGamemode.Server.Report if (player == null) return; - - ChatService.SendMessage(player, "!{#008fff}[REPORT]!{#FFFFFF} Admin " + admin.Name + " hat dein Ticket angenommen! (Benutze /rc zum Schreiben)"); - ChatService.BroadcastDutyAdmin("!{#008fff}[REPORT]!{#FFFFFF} " + admin.Name + " hat das Ticket von " + player.Name + " angenommen"); for (int a = 0; a < listReports.Count; a++) { @@ -91,10 +87,18 @@ namespace ReallifeGamemode.Server.Report if (temp.getUser().Equals(player.Name)) { + if (listReports[a].isAssigned()) + { + admin.SendChatMessage("Dieses Ticket wurde bereits angenommen"); + } + listReports[a].assign(admin.Name); break; } } + + ChatService.SendMessage(player, "!{#008fff}[REPORT]!{#FFFFFF} Admin " + admin.Name + " hat dein Ticket angenommen! (Benutze /rc zum Schreiben)"); + ChatService.BroadcastDutyAdmin("!{#008fff}[REPORT]!{#FFFFFF} " + admin.Name + " hat das Ticket von " + player.Name + " angenommen"); } [Command("rc", "~m~Benutzung: ~s~/rc text", GreedyArg = true)] @@ -200,11 +204,11 @@ namespace ReallifeGamemode.Server.Report ChatService.SendMessage(user, "!{#addc8d}Momentan sind " + GlobalHelper.DutyAdmins.Count + " Admins verfügbar"); ChatService.BroadcastDutyAdmin("!{#008fff}[TICKET]!{#FFFFFF} Eingehendes Ticket von~w~ " + user.Name + " (" + user.Handle.Value + ")~w~: " + text + " (Benutze /showtickets)"); ReportManage ticket = new ReportManage(user.Name, text); - ChatService.Broadcast("ADDTICKET:" + user.Name + ", " + text); + //ChatService.Broadcast("ADDTICKET:" + user.Name + ", " + text); listReports.Add(ticket); } if (type == "Quick Report") - ChatService.BroadcastAdmin("!{#008fff}[REPORT]~w~ " + user.Name + " (" + user.Handle.Value + ")~w~: " + text, AdminLevel.SUPPORTER); + ChatService.BroadcastAdmin("!{#008fff}[QR]~w~ " + user.Name + " (" + user.Handle.Value + ")~w~: " + text, AdminLevel.SUPPORTER); } [RemoteEvent("deleteReport")]