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

fixed player blips

Browse Source
This commit is contained in:
Lukas Moungos
2019-12-15 14:23:59 +01:00
parent 8f6fe89a66
commit c2f5c9e039
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,7 +290,7 @@ namespace ReallifeGamemode.Server.Commands
}
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 });
switch ((int?)targetUser.Faction.Id)
switch (targetUser.FactionId)
{
case null:
target.SetSharedData("blipColor", 0);

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

@@ -58,22 +58,6 @@ namespace ReallifeGamemode.Server.Events
player.SetData("editmode", false);
player.SetData("quicksavemode", "none");
}
switch ((int?)user.Faction.Id)
{
case null:
player.SetSharedData("blipColor", 0);
break;
case 8:
player.SetSharedData("blipColor", 83);
break;
case 7:
player.SetSharedData("blipColor", 52);
break;
case 4:
player.SetSharedData("blipColor", 5);
break;
}
var userBankAccount = user.GetBankAccount();
userBankAccount.Balance = userBankAccount.Balance;
@@ -97,6 +81,22 @@ namespace ReallifeGamemode.Server.Events
var userItems = dbContext.UserItems.Where(u => u.UserId == user.Id).ToList();
player.SetData("items", userItems);
switch (user.FactionId)
{
case null:
player.SetSharedData("blipColor", 0);
break;
case 8:
player.SetSharedData("blipColor", 83);
break;
case 7:
player.SetSharedData("blipColor", 52);
break;
case 4:
player.SetSharedData("blipColor", 5);
break;
}
if (user.CharacterId == null)
{
var currentPlayerCreatorDimension = (uint)NAPI.Data.GetWorldData("playerCreatorDimension");

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

@@ -64,7 +64,7 @@ namespace ReallifeGamemode.Server.Managers
ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen.");
ChatService.SendMessage(player, "!{02FCFF}Du hast die Einladung angenommen.");
switch ((int?)own.Faction.Id)
switch (own.FactionId)
{
case null:
player.SetSharedData("blipColor", 0);

9
ReallifeGamemode.Server/Wanted/Jail.cs
View File

@@ -22,8 +22,11 @@ namespace ReallifeGamemode.Server.Wanted
User user = client.GetUser();
if (user.JailTime > 0)
{
switch (user.Faction.Id)
switch (user.FactionId)
{
case null:
client.SetSharedData("blipColor", 0);
break;
case 8:
client.SetSharedData("blipColor", 83);
break;
@@ -33,9 +36,7 @@ namespace ReallifeGamemode.Server.Wanted
case 4:
client.SetSharedData("blipColor", 5);
break;
default:
client.SetSharedData("blipColor", 0);
break;
}
client.RemoveAllWeapons();
client.Health = 100;