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

Fix nametags

Browse Source
This commit is contained in:
VegaZ
2021-04-04 18:05:35 +02:00
parent 58dd14b816
commit f4cee09256
4 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -290,6 +290,7 @@ namespace ReallifeGamemode.Server.Commands
{ {
player.SetData("SAdminduty", true); player.SetData("SAdminduty", true);
player.SetSharedData("blipColor", 30); player.SetSharedData("blipColor", 30);
player.SetSharedData("nameTagColor", -2);
ChatService.SendMessage(player, "~g~ ** " + "Du befindest dich im T-Support"); ChatService.SendMessage(player, "~g~ ** " + "Du befindest dich im T-Support");
} }
else else
@@ -303,9 +304,12 @@ namespace ReallifeGamemode.Server.Commands
switch (targetUser.FactionId) switch (targetUser.FactionId)
{ {
case null: case null:
player.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
break;
case 0:
player.SetSharedData("blipColor", 0); player.SetSharedData("blipColor", 0);
break; break;
case 8: case 8:
player.SetSharedData("blipColor", 83); player.SetSharedData("blipColor", 83);
break; break;
@@ -321,6 +325,8 @@ namespace ReallifeGamemode.Server.Commands
player.SetSharedData("blipColor", 25); player.SetSharedData("blipColor", 25);
break; break;
} }
player.SetSharedData("nameTagColor", targetUser.FactionId);
if (targetUser.FactionId != null) player.SetSharedData("nameTagColor", targetUser.FactionId);
} }
} }
@@ -1487,25 +1493,30 @@ namespace ReallifeGamemode.Server.Commands
{ {
case null: case null:
target.SetSharedData("blipColor", 0); target.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
break;
case 0:
player.SetSharedData("nameTagColor", 0);
break; break;
case 8: case 8:
target.SetSharedData("blipColor", 83); player.SetSharedData("nameTagColor", 8);
break; break;
case 7: case 7:
target.SetSharedData("blipColor", 52); player.SetSharedData("nameTagColor", 7);
break; break;
case 4: case 4:
target.SetSharedData("blipColor", 5); player.SetSharedData("nameTagColor", 4);
break; break;
case 9: case 9:
target.SetSharedData("blipColor", 25); player.SetSharedData("nameTagColor", 9);
break; break;
} }
target.TriggerEvent("jailTime", 0); target.TriggerEvent("jailTime", 0);
if (targetUser.FactionId != null) player.SetSharedData("nameTagColor", targetUser.FactionId);
targetUser.Wanteds = 0; targetUser.Wanteds = 0;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
@@ -2440,6 +2451,11 @@ namespace ReallifeGamemode.Server.Commands
switch (u.FactionId) switch (u.FactionId)
{ {
case null: case null:
target.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
break;
case 0:
target.SetSharedData("blipColor", 0); target.SetSharedData("blipColor", 0);
break; break;
@@ -2456,8 +2472,10 @@ namespace ReallifeGamemode.Server.Commands
break; break;
case 9: case 9:
target.SetSharedData("blipColor", 25); target.SetSharedData("blipColor", 25);
break; break;
} }
if (u.FactionId != null) player.SetSharedData("nameTagColor", u.FactionId);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }
@@ -2504,6 +2522,7 @@ namespace ReallifeGamemode.Server.Commands
{ {
case null: case null:
target.SetSharedData("blipColor", 0); target.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
break; break;
case 8: case 8:
@@ -2521,7 +2540,7 @@ namespace ReallifeGamemode.Server.Commands
target.SetSharedData("blipColor", 25); target.SetSharedData("blipColor", 25);
break; break;
} }
if (u.FactionId != null) player.SetSharedData("nameTagColor", u.FactionId);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }

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

@@ -461,6 +461,15 @@ namespace ReallifeGamemode.Server.Commands
target.SetSharedData("blipColor", 0); target.SetSharedData("blipColor", 0);
switch (targetUser.FactionId) switch (targetUser.FactionId)
{ {
case null:
player.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
break;
case 0:
player.SetSharedData("blipColor", 0);
break;
case 8: case 8:
target.SetSharedData("blipColor", 83); target.SetSharedData("blipColor", 83);
break; break;
@@ -477,7 +486,7 @@ namespace ReallifeGamemode.Server.Commands
break; break;
} }
target.TriggerEvent("jailTime", 0); target.TriggerEvent("jailTime", 0);
if (targetUser.FactionId != null) player.SetSharedData("nameTagColor", targetUser.FactionId);
targetUser.Wanteds = 0; targetUser.Wanteds = 0;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }

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

@@ -109,17 +109,14 @@ namespace ReallifeGamemode.Server.Events
case 0: case 0:
player.SetSharedData("blipColor", 0); player.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
break; break;
case 8: case 8:
player.SetSharedData("blipColor", 83); player.SetSharedData("blipColor", 83);
player.SetSharedData("nameTagColor", user.FactionId);
break; break;
case 7: case 7:
player.SetSharedData("blipColor", 52); player.SetSharedData("blipColor", 52);
player.SetSharedData("nameTagColor", user.FactionId);
break; break;
case 4: case 4:
@@ -127,10 +124,9 @@ namespace ReallifeGamemode.Server.Events
break; break;
case 9: case 9:
player.SetSharedData("blipColor", 25); player.SetSharedData("blipColor", 25);
player.SetSharedData("nameTagColor", user.FactionId);
break; break;
} }
if(user.FactionId != null) player.SetSharedData("nameTagColor", user.FactionId);
if (user.CharacterId == null) if (user.CharacterId == null)

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

@@ -73,6 +73,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
default: default:
player.SetSharedData("blipColor", 0); player.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
break; break;
case 8: case 8:
@@ -90,7 +91,7 @@ namespace ReallifeGamemode.Server.Managers
player.SetSharedData("blipColor", 25); player.SetSharedData("blipColor", 25);
break; break;
} }
if (own.FactionId != null) player.SetSharedData("nameTagColor", own.FactionId);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }
@@ -284,6 +285,7 @@ namespace ReallifeGamemode.Server.Managers
ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " aus der Fraktion geworfen."); ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " aus der Fraktion geworfen.");
ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen."); ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
target.SetSharedData("blipColor", 0); target.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }