From 1b1231647f26aa31332ac5bd2cc60ac80646dc0f Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 13 Apr 2020 15:55:24 +0200 Subject: [PATCH] fix invite vielleicht --- .../Managers/InteractionManager.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 433897d2..922251e6 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -42,7 +42,7 @@ namespace ReallifeGamemode.Server.Managers return; } - Player leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_faction_invite")); + Player leader = NAPI.Player.GetPlayerFromName(player.GetData("accept_faction_invite")); player.ResetData("accept_faction_invite"); if (leader == null) @@ -51,25 +51,25 @@ namespace ReallifeGamemode.Server.Managers return; } - using (var dbContext = new DatabaseContext()) + using (var dbContext = new DatabaseContext(true)) { User u = leader.GetUser(dbContext); User own = player.GetUser(dbContext); - own.FactionId = u.FactionId; + own.Faction = u.Faction; own.FactionLeader = false; - own.FactionRankId = dbContext + own.FactionRank = dbContext .FactionRanks .OrderBy(x => x.Order) .Where(r => r.FactionId == own.FactionId) - .FirstOrDefault()?.Id ?? null; + .FirstOrDefault(); ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen."); ChatService.SendMessage(player, "!{02FCFF}Du hast die Einladung angenommen."); switch (own.FactionId) { - case null: + default: player.SetSharedData("blipColor", 0); break; case 8: @@ -94,7 +94,7 @@ namespace ReallifeGamemode.Server.Managers return; } - Player leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_group_invite")); + Player leader = NAPI.Player.GetPlayerFromName(player.GetData("accept_group_invite")); player.ResetData("accept_group_invite"); if (leader == null) @@ -192,10 +192,10 @@ namespace ReallifeGamemode.Server.Managers if (targetUser?.FactionId != null) { ChatService.ErrorMessage(player, "Dieser Spieler ist schon in einer Fraktion"); - return; + //return; } - target.SetData("accept_faction_invite", player.Handle); + target.SetData("accept_faction_invite", player.Name); ChatService.SendMessage(player, "!{02FCFF}Du hast dem Spieler " + target.Name + " eine Einladung in deine Fraktion gesendet."); ChatService.SendMessage(target, "!{02FCFF}Du hast von " + player.Name + " eine Einladung in die Fraktion \"" + playerUser.Faction.Name + "\" erhalten."); @@ -215,7 +215,7 @@ namespace ReallifeGamemode.Server.Managers return; } - target.SetData("accept_group_invite", player.Handle); + target.SetData("accept_group_invite", player.Name); ChatService.SendMessage(player, "!{02FCFF}Du hast dem Spieler " + target.Name + " eine Einladung in deine Gruppe gesendet."); ChatService.SendMessage(target, "!{02FCFF}Du hast von " + player.Name + " eine Einladung in die Gruppe \"" + playerUser.Group.Name + "\" erhalten."); @@ -425,7 +425,7 @@ namespace ReallifeGamemode.Server.Managers { player.SendNotification("~r~Spieler hat weder Auto- noch Motorradführerschein!"); } - else if(target == player) + else if (target == player) { player.SendNotification("~r~Du kannst dir selbst keine Punkte setzen!"); } @@ -441,7 +441,7 @@ namespace ReallifeGamemode.Server.Managers } player.SendNotification($"~w~Du hast ~y~{targetname} ~b~{amount} ~w~Strafpunkte gegeben. Grund: ~g~{reason}~w~."); target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ~y~{amount} ~w~Strafpunkte gegeben.", true); - if(target.GetUser().Points < 0) + if (target.GetUser().Points < 0) { using (var dbContext = new DatabaseContext()) {