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

try fix

Browse Source
This commit is contained in:
Lukas Moungos
2019-12-15 14:18:05 +01:00
parent be65be7285
commit 8f6fe89a66
3 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,9 +290,11 @@ namespace ReallifeGamemode.Server.Commands
} }
ChatService.SendMessage(target, "!{#8181E9}Deine Akte wurde von " + player.Name + " gelöscht. Grund: " + reason); ChatService.SendMessage(target, "!{#8181E9}Deine Akte wurde von " + player.Name + " gelöscht. Grund: " + reason);
ChatService.BroadcastFaction("!{#8181E9}HQ: Die Akte von " + target.Name + " wurde von " + player.Name + " gelöscht. Grund: " + reason + ".", new List<int>() { 1, 3 }); ChatService.BroadcastFaction("!{#8181E9}HQ: Die Akte von " + target.Name + " wurde von " + player.Name + " gelöscht. Grund: " + reason + ".", new List<int>() { 1, 3 });
target.SetSharedData("blipColor", 0); switch ((int?)targetUser.Faction.Id)
switch (targetUser.Faction.Id)
{ {
case null:
target.SetSharedData("blipColor", 0);
break;
case 8: case 8:
target.SetSharedData("blipColor", 83); target.SetSharedData("blipColor", 83);
break; break;
@@ -302,9 +304,6 @@ namespace ReallifeGamemode.Server.Commands
case 4: case 4:
target.SetSharedData("blipColor", 5); target.SetSharedData("blipColor", 5);
break; break;
default:
target.SetSharedData("blipColor", 0);
break;
} }

24
ReallifeGamemode.Server/Events/Login.cs
View File

@@ -58,20 +58,20 @@ namespace ReallifeGamemode.Server.Events
player.SetData("editmode", false); player.SetData("editmode", false);
player.SetData("quicksavemode", "none"); player.SetData("quicksavemode", "none");
} }
switch (user.Faction.Id) switch ((int?)user.Faction.Id)
{ {
case 8: case null:
player.SetSharedData("blipColor", 83);
break;
case 7:
player.SetSharedData("blipColor", 52);
break;
case 4:
player.SetSharedData("blipColor", 5);
break;
default:
player.SetSharedData("blipColor", 0); player.SetSharedData("blipColor", 0);
break; break;
case 8:
player.SetSharedData("blipColor", 83);
break;
case 7:
player.SetSharedData("blipColor", 52);
break;
case 4:
player.SetSharedData("blipColor", 5);
break;
} }

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

@@ -64,17 +64,20 @@ namespace ReallifeGamemode.Server.Managers
ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen."); ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen.");
ChatService.SendMessage(player, "!{02FCFF}Du hast die Einladung angenommen."); ChatService.SendMessage(player, "!{02FCFF}Du hast die Einladung angenommen.");
switch (own.Faction.Name) switch ((int?)own.Faction.Id)
{ {
case "Ballas": case null:
player.SetSharedData("blipColor", 83); player.SetSharedData("blipColor", 0);
break; break;
case "Grove": case 8:
player.SetSharedData("blipColor", 52); player.SetSharedData("blipColor", 83);
break; break;
case "Trucker": case 7:
player.SetSharedData("blipColor", 5); player.SetSharedData("blipColor", 52);
break; break;
case 4:
player.SetSharedData("blipColor", 5);
break;
} }
dbContext.SaveChanges(); dbContext.SaveChanges();