diff --git a/ReallifeGamemode.Client/Login/main.ts b/ReallifeGamemode.Client/Login/main.ts index a339bb73..5c03c481 100644 --- a/ReallifeGamemode.Client/Login/main.ts +++ b/ReallifeGamemode.Client/Login/main.ts @@ -66,13 +66,4 @@ export default function (globalData: IGlobalData): void { loginCam.setActive(false); mp.game.cam.renderScriptCams(false, false, 0, true, false); }); - - mp.events.add('SetNametagColor',(faction: string) => { - - mp.nametags.set({ - color: [73, 137, 0, 255], - }); - - - }); } \ No newline at end of file diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index a553d1ef..7198eec7 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -88,8 +88,8 @@ deathScreen(); import Infobox from './Gui/infobox'; Infobox(globalData); -//import nametags from './Gui/nametags'; -//nametags(); +import nametags from './Gui/nametags'; +nametags(); import playerList from './Gui/playerlist'; playerList(globalData); diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs index 530e083e..7f4951a5 100644 --- a/ReallifeGamemode.Server/Events/Login.cs +++ b/ReallifeGamemode.Server/Events/Login.cs @@ -63,7 +63,6 @@ namespace ReallifeGamemode.Server.Events player.SetData("duty", false); player.SetData("Adminduty", false); player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney, 0); - player.TriggerEvent("SetNametagColor"); Gangwar.Gangwar.loadPlayer(player); if (user.FactionLeader) {