From 8a22b4292a8c9c8c4ac5764bd8d1ebbd7a5e4d42 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 11 May 2019 22:14:03 +0200 Subject: [PATCH] close interaction menu when accepting invite, remove invite accept debug messages --- ReallifeGamemode.Client/Interaction/interactionmenu.ts | 2 +- ReallifeGamemode.Server/Managers/InteractionManager.cs | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index afe6c4b6..01ecc976 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -56,8 +56,8 @@ export default function (globalData: GlobalData) { menu.ItemSelect.on((item: NativeUI.UIMenuItem, index: number) => { if (item === acceptItem) { - mp.gui.chat.push("accept invite = " + acceptItem.SelectedValue); mp.events.callRemote("CLIENT:InteractionMenu_AcceptInvite", acceptItem.SelectedValue); + menu.Close(); } }); diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 69a4a147..5d6446be 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -30,14 +30,12 @@ namespace ReallifeGamemode.Server.Managers if (type == "Fraktion") // Fraktions Invite annehmen { - NAPI.Chat.SendChatMessageToAll("faction invite 1"); if (!player.HasData("accept_faction_invite")) { ChatService.Error(player, "Du hast keine Einladung in eine Fraktion erhalten"); return; } - NAPI.Chat.SendChatMessageToAll("faction invite 2"); Client leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_faction_invite")); player.ResetData("accept_faction_invite"); @@ -47,8 +45,6 @@ namespace ReallifeGamemode.Server.Managers return; } - NAPI.Chat.SendChatMessageToAll("faction invite 3"); - using (var dbContext = new DatabaseContext()) { User u = leader.GetUser(dbContext);