diff --git a/ReallifeGamemode.Client/assets/chat/js/main.js b/ReallifeGamemode.Client/assets/chat/js/main.js index 7762d0f1..55576e9b 100644 --- a/ReallifeGamemode.Client/assets/chat/js/main.js +++ b/ReallifeGamemode.Client/assets/chat/js/main.js @@ -87,7 +87,7 @@ var chatAPI = chat.size++; if (chat.size >= chat.history_limit) { - chat.container.children(":last").remove(); + chat.container.children(":first").remove(); } }, diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 140d180e..38d79ada 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -328,6 +328,11 @@ namespace ReallifeGamemode.Server.Extensions int nameTagColor = 0; Player player = user.Player; + if(player == null || !player.IsLoggedIn()) + { + return; + } + bool duty = user.GetData("duty"); if (player.GetData("SAdminduty"))