aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-05 19:07:15 +02:00
parent afaa4202d9 696cd5f6f5
commit e0d7dabe50
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -363,7 +363,7 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
if(player.Position.DistanceTo(target.Position) > 3) if(player.Position.DistanceTo(target.Position) > 5)
{ {
ChatService.ErrorMessage(player, "Der Patient ist zu weit entfernt"); ChatService.ErrorMessage(player, "Der Patient ist zu weit entfernt");
return; return;

2
ReallifeGamemode.Server/Extensions/ClientExtension.cs
View File

@@ -129,9 +129,9 @@ namespace ReallifeGamemode.Server.Extensions
{ {
User dbUser = dbContext.Users.Where(u => u.Id == user.Id).FirstOrDefault(); User dbUser = dbContext.Users.Where(u => u.Id == user.Id).FirstOrDefault();
dbUser.Wanteds = newWanteds; dbUser.Wanteds = newWanteds;
dbUser.SetBlipAndNametagColor();
dbContext.SaveChanges(); 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, "!{#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}Fahnundgslevel:~s~ " + newWanteds);

6
ReallifeGamemode.Server/Factions/Medic/Medic.cs
View File

@@ -101,15 +101,15 @@ namespace ReallifeGamemode.Server.Factions.Medic
public static void CheckHealDecisionDistance() public static void CheckHealDecisionDistance()
{ {
foreach(var healAuftrag in HealDecisions) 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.dMedic.SendNotification("~r~Die Heal-Anfrage wurde abgebrochen");
healAuftrag.dTarget.SendNotification("~r~Die Heal-Anfrage wurde abgebrochen"); healAuftrag.dTarget.SendNotification("~r~Die Heal-Anfrage wurde abgebrochen");
healAuftrag.dTarget.ResetData("healDecision"); healAuftrag.dTarget.ResetData("healDecision");
var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == healAuftrag.dTarget); var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == healAuftrag.dTarget);
HealDecisions.Remove(activeDecision); HealDecisions.Remove(healAuftrag);
} }
} }
} }

2
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -63,7 +63,7 @@ namespace ReallifeGamemode.Server.Managers
own.FactionRank = dbContext own.FactionRank = dbContext
.FactionRanks .FactionRanks
.OrderBy(x => x.Order) .OrderBy(x => x.Order)
.Where(r => r.FactionId == own.FactionId) .Where(r => r.FactionId == u.FactionId)
.FirstOrDefault(); .FirstOrDefault();
ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen."); ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen.");