From 44e1cca2b8c996d9911b6fd96a662e9305c917d5 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Mon, 5 Apr 2021 18:50:20 +0200 Subject: [PATCH 1/4] Fix Healdecisions --- ReallifeGamemode.Server/Factions/Medic/Medic.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index 2c4a1154..58cc2edb 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -101,7 +101,7 @@ namespace ReallifeGamemode.Server.Factions.Medic public static void CheckHealDecisionDistance() { - foreach(var healAuftrag in HealDecisions) + foreach(var healAuftrag in HealDecisions.ToList()) { if (healAuftrag.dMedic.Position.DistanceTo(healAuftrag.dTarget.Position) >= 10) { @@ -109,7 +109,7 @@ namespace ReallifeGamemode.Server.Factions.Medic healAuftrag.dTarget.SendNotification("~r~Die Heal-Anfrage wurde abgebrochen"); healAuftrag.dTarget.ResetData("healDecision"); var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == healAuftrag.dTarget); - HealDecisions.Remove(activeDecision); + HealDecisions.Remove(healAuftrag); } } } From ed704b7ed9b5105192d46070f2edfc0abe70c6fd Mon Sep 17 00:00:00 2001 From: VegaZ Date: Mon, 5 Apr 2021 18:55:54 +0200 Subject: [PATCH 2/4] Fix range --- ReallifeGamemode.Server/Commands/FactionCommands.cs | 2 +- ReallifeGamemode.Server/Factions/Medic/Medic.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs index acad0b23..faae6191 100644 --- a/ReallifeGamemode.Server/Commands/FactionCommands.cs +++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs @@ -363,7 +363,7 @@ namespace ReallifeGamemode.Server.Commands return; } - if(player.Position.DistanceTo(target.Position) > 3) + if(player.Position.DistanceTo(target.Position) > 5) { ChatService.ErrorMessage(player, "Der Patient ist zu weit entfernt"); return; diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index 58cc2edb..f4050385 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -103,7 +103,7 @@ namespace ReallifeGamemode.Server.Factions.Medic { foreach(var healAuftrag in HealDecisions.ToList()) { - if (healAuftrag.dMedic.Position.DistanceTo(healAuftrag.dTarget.Position) >= 10) + if (healAuftrag.dMedic.Position.DistanceTo(healAuftrag.dTarget.Position) > 5) { healAuftrag.dMedic.SendNotification("~r~Die Heal-Anfrage wurde abgebrochen"); healAuftrag.dTarget.SendNotification("~r~Die Heal-Anfrage wurde abgebrochen"); From 005ff5be2cde438f5c72db7c52bddaa70e84bc0c Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 5 Apr 2021 18:07:54 +0200 Subject: [PATCH 3/4] invite fraklohn und waffenkammer fix --- ReallifeGamemode.Server/Managers/InteractionManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 0ad66ab3..5d6875fc 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -63,7 +63,7 @@ namespace ReallifeGamemode.Server.Managers own.FactionRank = dbContext .FactionRanks .OrderBy(x => x.Order) - .Where(r => r.FactionId == own.FactionId) + .Where(r => r.FactionId == u.FactionId) .FirstOrDefault(); ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen."); From 696cd5f6f56b67fe79f01f0763650e3e9a453852 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 5 Apr 2021 18:53:05 +0200 Subject: [PATCH 4/4] fix wanteds nametag blip --- ReallifeGamemode.Server/Extensions/ClientExtension.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 6849968d..ebdee723 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -129,9 +129,9 @@ namespace ReallifeGamemode.Server.Extensions { User dbUser = dbContext.Users.Where(u => u.Id == user.Id).FirstOrDefault(); dbUser.Wanteds = newWanteds; + dbUser.SetBlipAndNametagColor(); dbContext.SaveChanges(); } - user.SetBlipAndNametagColor(); 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);