From b528304cf10673eb9ebebce9c35a6a7efa773402 Mon Sep 17 00:00:00 2001 From: Bitl Date: Sat, 13 Nov 2021 16:04:48 -0700 Subject: [PATCH] fixes --- Novetus/NovetusCMD/Classes/LocalFuncs.cs | 76 +++++++++---------- .../StorageAndFunctions/GlobalFuncs.cs | 33 +++++--- .../Classes/Launcher/SplashLoader.cs | 33 ++++---- .../Forms/LauncherForm/LauncherFormShared.cs | 36 +++++---- Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs | 10 +-- changelog.txt | 12 ++- documentation.txt | 2 +- scripts/game/2006S-Shaders/CSMPFunctions.lua | 3 +- scripts/game/2006S/CSMPFunctions.lua | 3 +- scripts/game/2007E-Shaders/CSMPFunctions.lua | 3 +- scripts/game/2007E/CSMPFunctions.lua | 3 +- scripts/game/2007M-Shaders/CSMPFunctions.lua | 3 +- scripts/game/2007M/CSMPFunctions.lua | 3 +- scripts/game/2008M/CSMPFunctions.lua | 3 +- scripts/game/2009E-HD/CSMPFunctions.lua | 3 +- scripts/game/2009E/CSMPFunctions.lua | 3 +- scripts/game/2010L/CSMPFunctions.lua | 5 +- scripts/game/2011E/CSMPFunctions.lua | 3 +- scripts/game/2011M/CSMPFunctions.lua | 3 +- scripts/launcher/splashes.txt | 6 +- 20 files changed, 141 insertions(+), 105 deletions(-) diff --git a/Novetus/NovetusCMD/Classes/LocalFuncs.cs b/Novetus/NovetusCMD/Classes/LocalFuncs.cs index fe6afca..52ec61c 100644 --- a/Novetus/NovetusCMD/Classes/LocalFuncs.cs +++ b/Novetus/NovetusCMD/Classes/LocalFuncs.cs @@ -16,44 +16,44 @@ namespace NovetusCMD public static void CommandInfo() { - GlobalFuncs.ConsolePrint("Novetus CMD Command Line Arguments", 3, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("General", 3, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("-help | Displays the help.", 4, true); - GlobalFuncs.ConsolePrint("-no3d | Launches server in NoGraphics mode", 4, true); - GlobalFuncs.ConsolePrint("-script | Loads an additional server script.", 4, true); - GlobalFuncs.ConsolePrint("-outputinfo | Outputs all information about the running server to a text file.", 4, true); - GlobalFuncs.ConsolePrint("-debug | Disables launching of the server for debugging purposes.", 4, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("Custom server options", 3, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("-upnp | Turns on UPnP.", 4, true); - GlobalFuncs.ConsolePrint("-map | Sets the map.", 4, true); - GlobalFuncs.ConsolePrint("-client | Sets the client.", 4, true); - GlobalFuncs.ConsolePrint("-port | Sets the server port.", 4, true); - GlobalFuncs.ConsolePrint("-maxplayers | Sets the number of players.", 4, true); - GlobalFuncs.ConsolePrint("-notifications | Toggles server join/leave notifications.", 4, true); - GlobalFuncs.ConsolePrint("-serverbrowsername | Changes the name the server uses upon connection to the master server.", 4, true); - GlobalFuncs.ConsolePrint("-serverbrowseraddress | Changes the master server address.", 4, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("How to launch:", 3, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("Create a shortcut to NovetusCMD in the bin folder of Novetus' Directory or", 4, true); - GlobalFuncs.ConsolePrint("create a batch file that launches NovetusCMD.", 4, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("Shortcuts", 3, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("Right-click your shortcut and then go to Properties -> Shortcut.", 4, true); - GlobalFuncs.ConsolePrint("Go to 'Target' and then click the end of where it says 'NovetusCMD.exe'", 4, true); - GlobalFuncs.ConsolePrint("Press space and then type in whatever arguments you please.", 4, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("Batch", 3, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("Click the end of where it says 'NovetusCMD.exe'", 4, true); - GlobalFuncs.ConsolePrint("Press space and then type in whatever arguments you please.", 4, true); - GlobalFuncs.ConsolePrint("---------", 1, true); - GlobalFuncs.ConsolePrint("Press any key to close...", 2, true); + GlobalFuncs.ConsolePrint("Novetus CMD Command Line Arguments", 3, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("General", 3, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("-help | Displays the help.", 4, true, true); + GlobalFuncs.ConsolePrint("-no3d | Launches server in NoGraphics mode", 4, true, true); + GlobalFuncs.ConsolePrint("-script | Loads an additional server script.", 4, true, true); + GlobalFuncs.ConsolePrint("-outputinfo | Outputs all information about the running server to a text file.", 4, true, true); + GlobalFuncs.ConsolePrint("-debug | Disables launching of the server for debugging purposes.", 4, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("Custom server options", 3, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("-upnp | Turns on UPnP.", 4, true, true); + GlobalFuncs.ConsolePrint("-map | Sets the map.", 4, true, true); + GlobalFuncs.ConsolePrint("-client | Sets the client.", 4, true, true); + GlobalFuncs.ConsolePrint("-port | Sets the server port.", 4, true, true); + GlobalFuncs.ConsolePrint("-maxplayers | Sets the number of players.", 4, true, true); + GlobalFuncs.ConsolePrint("-notifications | Toggles server join/leave notifications.", 4, true, true); + GlobalFuncs.ConsolePrint("-serverbrowsername | Changes the name the server uses upon connection to the master server.", 4, true, true); + GlobalFuncs.ConsolePrint("-serverbrowseraddress | Changes the master server address.", 4, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("How to launch:", 3, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("Create a shortcut to NovetusCMD in the bin folder of Novetus' Directory or", 4, true, true); + GlobalFuncs.ConsolePrint("create a batch file that launches NovetusCMD.", 4, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("Shortcuts", 3, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("Right-click your shortcut and then go to Properties -> Shortcut.", 4, true, true); + GlobalFuncs.ConsolePrint("Go to 'Target' and then click the end of where it says 'NovetusCMD.exe'", 4, true, true); + GlobalFuncs.ConsolePrint("Press space and then type in whatever arguments you please.", 4, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("Batch", 3, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("Click the end of where it says 'NovetusCMD.exe'", 4, true, true); + GlobalFuncs.ConsolePrint("Press space and then type in whatever arguments you please.", 4, true, true); + GlobalFuncs.ConsolePrint("---------", 1, true, true); + GlobalFuncs.ConsolePrint("Press any key to close...", 2, true, true); } } #endregion diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs index 81164d4..3b5162a 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs @@ -2177,15 +2177,23 @@ public class GlobalFuncs } #if LAUNCHER - public static void ConsolePrint(string text, int type, RichTextBox box, bool noLog = false) + public static void ConsolePrint(string text, int type, RichTextBox box, bool noLog = false, bool noTime = false) { if (box == null) return; - box.AppendText("[" + DateTime.Now.ToShortTimeString() + "] - ", Color.White); + if (!noTime) + { + box.AppendText("[" + DateTime.Now.ToShortTimeString() + "] - ", Color.White); + } switch (type) { + case 1: + box.AppendText(text, Color.White); + if (!noLog) + LogPrint(text); + break; case 2: box.AppendText(text, Color.Red); if (!noLog) @@ -2211,9 +2219,9 @@ public class GlobalFuncs if (!noLog) LogPrint(text); break; - case 1: + case 0: default: - box.AppendText(text, Color.White); + box.AppendText(text, Color.Black); if (!noLog) LogPrint(text); break; @@ -2222,7 +2230,7 @@ public class GlobalFuncs box.AppendText(Environment.NewLine, Color.White); } #elif CMD - public static void ConsolePrint(string text, int type, bool notime = false) + public static void ConsolePrint(string text, int type, bool notime = false, bool noLog = false) { if (!notime) { @@ -2233,24 +2241,29 @@ public class GlobalFuncs { case 2: ConsoleText(text, ConsoleColor.Red); - LogPrint(text, 2); + if (!noLog) + LogPrint(text, 2); break; case 3: ConsoleText(text, ConsoleColor.Green); - LogPrint(text); + if (!noLog) + LogPrint(text); break; case 4: ConsoleText(text, ConsoleColor.Cyan); - LogPrint(text); + if (!noLog) + LogPrint(text); break; case 5: ConsoleText(text, ConsoleColor.Yellow); - LogPrint(text, 3); + if (!noLog) + LogPrint(text, 3); break; case 1: default: ConsoleText(text, ConsoleColor.White); - LogPrint(text); + if (!noLog) + LogPrint(text); break; } diff --git a/Novetus/NovetusLauncher/Classes/Launcher/SplashLoader.cs b/Novetus/NovetusLauncher/Classes/Launcher/SplashLoader.cs index fe092bb..53b4c3a 100644 --- a/Novetus/NovetusLauncher/Classes/Launcher/SplashLoader.cs +++ b/Novetus/NovetusLauncher/Classes/Launcher/SplashLoader.cs @@ -26,22 +26,6 @@ public class Splash TextArray = text.Split('|'); SplashText = TextArray[0]; SplashContext = TextArray[1]; - - if (SplashText.Contains("[normal]")) - { - Compatibility = SplashCompatibility.Normal; - } - else if (SplashText.Contains("[stylish]")) - { - Compatibility = SplashCompatibility.Stylish; - } - else - { - Compatibility = SplashCompatibility.None; - } - - SplashText = SplashText.Replace("[normal]", "").Replace("[stylish]", ""); - IsSpecialSplash = specialSplashMode; } else @@ -50,6 +34,19 @@ public class Splash SplashContext = ""; } + if (SplashText.Contains("[normal]")) + { + Compatibility = SplashCompatibility.Normal; + } + else if (SplashText.Contains("[stylish]")) + { + Compatibility = SplashCompatibility.Stylish; + } + else + { + Compatibility = SplashCompatibility.None; + } + SplashText = DecodeSplashString(SplashText); SplashContext = DecodeSplashString(SplashContext); @@ -167,7 +164,9 @@ public class Splash .Replace("%nextyear%", (now.Year + 1).ToString()) .Replace("%newline%", "\n") .Replace("%branch%", GlobalVars.ProgramInformation.Branch) - .Replace("%nextbranch%", (Convert.ToDouble(GlobalVars.ProgramInformation.Branch) + 0.1).ToString()); + .Replace("%nextbranch%", (Convert.ToDouble(GlobalVars.ProgramInformation.Branch) + 0.1).ToString()) + .Replace("[normal]", "") + .Replace("[stylish]", ""); } public string SplashText { get; set; } diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs index 6a556b2..f0ec9de 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs @@ -790,25 +790,23 @@ namespace NovetusLauncher public void ConsoleHelp() { - GlobalFuncs.ConsolePrint("Help:", 3, ConsoleBox); - GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox); - GlobalFuncs.ConsolePrint("= client | Launches client with launcher settings", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("= solo | Launches client in Play Solo mode with launcher settings", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("= server 3d | Launches server with launcher settings", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("= server no3d | Launches server in NoGraphics mode with launcher settings", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("= studio map | Launches Roblox Studio with the selected map", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("= studio nomap | Launches Roblox Studio without the selected map", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("= sdk | Launches the Novetus SDK Launcher", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox); - GlobalFuncs.ConsolePrint("= config save | Saves the config file", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("= config load | Reloads the config file", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("= config reset | Resets the config file", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox); - GlobalFuncs.ConsolePrint("= dlldelete off | Turn off the deletion of opengl32.dll when ReShade is off.", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("= dlldelete on | Turn on the deletion of opengl32.dll when ReShade is off.", 4, ConsoleBox); - GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox); - GlobalFuncs.ConsolePrint(LocalVars.important2, 1, ConsoleBox); - GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox); + GlobalFuncs.ConsolePrint("Help:", 3, ConsoleBox, true); + GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= client | Launches client with launcher settings", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= solo | Launches client in Play Solo mode with launcher settings", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= server 3d | Launches server with launcher settings", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= server no3d | Launches server in NoGraphics mode with launcher settings", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= studio map | Launches Roblox Studio with the selected map", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= studio nomap | Launches Roblox Studio without the selected map", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= sdk | Launches the Novetus SDK Launcher", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= config save | Saves the config file", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= config load | Reloads the config file", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= config reset | Resets the config file", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= dlldelete off | Turn off the deletion of opengl32.dll when ReShade is off.", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint("= dlldelete on | Turn on the deletion of opengl32.dll when ReShade is off.", 4, ConsoleBox, true); + GlobalFuncs.ConsolePrint(LocalVars.important2, 0, ConsoleBox, true, true); } public void SwitchStyles() diff --git a/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs b/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs index 851a030..096f827 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs @@ -632,7 +632,7 @@ public partial class AssetSDK : Form switch (type) { case RobloxFileType.RBXL: - typeFilter = "Roblox Level (*.rbxl)|*.rbxl|ROBLOX Level (*.rbxlx)|*.rbxlx"; + typeFilter = "Roblox Level (*.rbxl)|*.rbxl|Roblox Level (*.rbxlx)|*.rbxlx"; break; /*case RobloxFileType.Script: typeFilter = "Lua Script (*.lua)|*.lua"; @@ -642,11 +642,9 @@ public partial class AssetSDK : Form break; } - OpenFileDialog openFileDialog1 = new OpenFileDialog - { - Filter = typeFilter, - Title = "Open Roblox level or model", - }; + OpenFileDialog openFileDialog1 = new OpenFileDialog(); + openFileDialog1.Filter = typeFilter; + openFileDialog1.Title = "Open Roblox level or model"; return openFileDialog1; } diff --git a/changelog.txt b/changelog.txt index 521bea3..8ec6d93 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,16 @@ 1.3 v12.2021.1 Changes from v11.2021.1: -- Added an additional warning about Dialog boxes being disabled in later clients. +- Added an additional warning about certain GUI elements being disabled in later clients when No3D is selected. +- Novetus no longer requires the Script MD5 when generating a clientinfo.nov. +- Placed the %port% ClientScript variable into the Server category. +- Fixed the URL Override box in the Asset SDK not working. +- The Asset SDK Asset Localizer is now known as the Asset Fixer! + - Added the ability to "fix" all asset URLs by changing them to a URL of your choice! +- The Bootstrapper now creates error logs of its own. +- Fixed logging for most Novetus applications. +- Fixed a bug in all clients where kicking a player would kick the entire server. +- Fixed a crash that occured in 2010L after kicking a player. +- Fixed small decoding issues with the splash system. ---------------------------------------------------------------------------- 1.3 v11.2021.1 Changes from Pre-Release 5: diff --git a/documentation.txt b/documentation.txt index f046206..624639e 100644 --- a/documentation.txt +++ b/documentation.txt @@ -18,7 +18,6 @@ General: %args% - Default arguments provided by Novetus for launching clients. Use only this without any tags (except for ) if you want default Novetus arguments. %argstring% - Gets the default script arguments for a tag. %ip% - Current IP address. -%port% - Returns the port when hosting a server. %addonscriptpath% - The path to an additional server script used by NovetusCMD. %scripttype% - Returns the type of script we are using as a string. %version% - Returns Novetus' version. @@ -30,6 +29,7 @@ General: Server: %limit% - Max Player limit. %notifications% - Server join/leave notifications. +%port% - Returns the port when hosting a server. Security: %md5launcher% - Generate a MD5 for the Novetus Launcher. diff --git a/scripts/game/2006S-Shaders/CSMPFunctions.lua b/scripts/game/2006S-Shaders/CSMPFunctions.lua index 5987f20..573ca6c 100644 --- a/scripts/game/2006S-Shaders/CSMPFunctions.lua +++ b/scripts/game/2006S-Shaders/CSMPFunctions.lua @@ -21,8 +21,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2006S/CSMPFunctions.lua b/scripts/game/2006S/CSMPFunctions.lua index 3d4b5b2..f0ee828 100644 --- a/scripts/game/2006S/CSMPFunctions.lua +++ b/scripts/game/2006S/CSMPFunctions.lua @@ -21,8 +21,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2007E-Shaders/CSMPFunctions.lua b/scripts/game/2007E-Shaders/CSMPFunctions.lua index 5a0568e..8de8f35 100644 --- a/scripts/game/2007E-Shaders/CSMPFunctions.lua +++ b/scripts/game/2007E-Shaders/CSMPFunctions.lua @@ -21,8 +21,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2007E/CSMPFunctions.lua b/scripts/game/2007E/CSMPFunctions.lua index 5a0568e..8de8f35 100644 --- a/scripts/game/2007E/CSMPFunctions.lua +++ b/scripts/game/2007E/CSMPFunctions.lua @@ -21,8 +21,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2007M-Shaders/CSMPFunctions.lua b/scripts/game/2007M-Shaders/CSMPFunctions.lua index cda11bc..e69edcb 100644 --- a/scripts/game/2007M-Shaders/CSMPFunctions.lua +++ b/scripts/game/2007M-Shaders/CSMPFunctions.lua @@ -21,8 +21,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2007M/CSMPFunctions.lua b/scripts/game/2007M/CSMPFunctions.lua index 00e4e4f..bd78695 100644 --- a/scripts/game/2007M/CSMPFunctions.lua +++ b/scripts/game/2007M/CSMPFunctions.lua @@ -21,8 +21,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2008M/CSMPFunctions.lua b/scripts/game/2008M/CSMPFunctions.lua index d4837ca..319632d 100644 --- a/scripts/game/2008M/CSMPFunctions.lua +++ b/scripts/game/2008M/CSMPFunctions.lua @@ -21,8 +21,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2009E-HD/CSMPFunctions.lua b/scripts/game/2009E-HD/CSMPFunctions.lua index 82b62b0..4bec753 100644 --- a/scripts/game/2009E-HD/CSMPFunctions.lua +++ b/scripts/game/2009E-HD/CSMPFunctions.lua @@ -21,8 +21,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2009E/CSMPFunctions.lua b/scripts/game/2009E/CSMPFunctions.lua index 82b62b0..4bec753 100644 --- a/scripts/game/2009E/CSMPFunctions.lua +++ b/scripts/game/2009E/CSMPFunctions.lua @@ -21,8 +21,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2010L/CSMPFunctions.lua b/scripts/game/2010L/CSMPFunctions.lua index 44408a4..c9f21a8 100644 --- a/scripts/game/2010L/CSMPFunctions.lua +++ b/scripts/game/2010L/CSMPFunctions.lua @@ -22,8 +22,11 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then + --2010L crashes if we don't do this. + wait(0.3) Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2011E/CSMPFunctions.lua b/scripts/game/2011E/CSMPFunctions.lua index c3cdf65..43a0575 100644 --- a/scripts/game/2011E/CSMPFunctions.lua +++ b/scripts/game/2011E/CSMPFunctions.lua @@ -26,8 +26,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/game/2011M/CSMPFunctions.lua b/scripts/game/2011M/CSMPFunctions.lua index 42662e7..5fe10c9 100644 --- a/scripts/game/2011M/CSMPFunctions.lua +++ b/scripts/game/2011M/CSMPFunctions.lua @@ -24,8 +24,9 @@ function KickPlayer(Player,reason) if (Player ~= nil) then for _,Child in pairs(Server:children()) do name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value - if (Server:findFirstChild(name) ~= nil) then + if (Server:findFirstChild(name) ~= nil and Child.Name == name) then Child:CloseConnection() + print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason) end end end diff --git a/scripts/launcher/splashes.txt b/scripts/launcher/splashes.txt index 764689c..b3c45c0 100644 --- a/scripts/launcher/splashes.txt +++ b/scripts/launcher/splashes.txt @@ -171,4 +171,8 @@ Not a metaverse! [stylish]We both know that there are a thousand ways I could destroy you right now.|And 941 of them hurt. IT WAS 99 CENTS! PRETTY PRETTY NINE!|DEATH GRIPS IS ONLINE! -I AM GONNA TAKE YOUR COAT|SAY THANKS \ No newline at end of file +I AM GONNA TAKE YOUR COAT|SAY THANKS +[normal]Wear your heart on your sleeve!|It's the only way to live! Everything will fall into place, you'll see! +[stylish]Wear your heart on your sleeve! It's the only way to live!|Everything will fall into place, you'll see! +[normal]If the entire world is getting banned by admins...|I'm taking a physgun with me. +[stylish]If the entire world is getting banned by admins, I'm taking a physgun with me. \ No newline at end of file