Bitl
/
Novetus_src
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
Bitl 2021-11-13 16:04:48 -07:00
parent 0468b36e4f
commit b528304cf1
20 changed files with 141 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Novetus/NovetusCMD/Classes/LocalFuncs.cs
View File

@ -16,44 +16,44 @@ namespace NovetusCMD
public static void CommandInfo() public static void CommandInfo()
{ {
GlobalFuncs.ConsolePrint("Novetus CMD Command Line Arguments", 3, true); GlobalFuncs.ConsolePrint("Novetus CMD Command Line Arguments", 3, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("General", 3, true); GlobalFuncs.ConsolePrint("General", 3, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("-help | Displays the help.", 4, true); GlobalFuncs.ConsolePrint("-help | Displays the help.", 4, true, true);
GlobalFuncs.ConsolePrint("-no3d | Launches server in NoGraphics mode", 4, true); GlobalFuncs.ConsolePrint("-no3d | Launches server in NoGraphics mode", 4, true, true);
GlobalFuncs.ConsolePrint("-script <path to script> | Loads an additional server script.", 4, true); GlobalFuncs.ConsolePrint("-script <path to 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); 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); GlobalFuncs.ConsolePrint("-debug | Disables launching of the server for debugging purposes.", 4, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("Custom server options", 3, true); GlobalFuncs.ConsolePrint("Custom server options", 3, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("-upnp | Turns on UPnP.", 4, true); GlobalFuncs.ConsolePrint("-upnp | Turns on UPnP.", 4, true, true);
GlobalFuncs.ConsolePrint("-map <map filename> | Sets the map.", 4, true); GlobalFuncs.ConsolePrint("-map <map filename> | Sets the map.", 4, true, true);
GlobalFuncs.ConsolePrint("-client <client name> | Sets the client.", 4, true); GlobalFuncs.ConsolePrint("-client <client name> | Sets the client.", 4, true, true);
GlobalFuncs.ConsolePrint("-port <port number> | Sets the server port.", 4, true); GlobalFuncs.ConsolePrint("-port <port number> | Sets the server port.", 4, true, true);
GlobalFuncs.ConsolePrint("-maxplayers <number of players> | Sets the number of players.", 4, true); GlobalFuncs.ConsolePrint("-maxplayers <number of players> | Sets the number of players.", 4, true, true);
GlobalFuncs.ConsolePrint("-notifications <true/false> | Toggles server join/leave notifications.", 4, true); GlobalFuncs.ConsolePrint("-notifications <true/false> | Toggles server join/leave notifications.", 4, true, true);
GlobalFuncs.ConsolePrint("-serverbrowsername <server name> | Changes the name the server uses upon connection to the master server.", 4, true); GlobalFuncs.ConsolePrint("-serverbrowsername <server name> | Changes the name the server uses upon connection to the master server.", 4, true, true);
GlobalFuncs.ConsolePrint("-serverbrowseraddress <master server address> | Changes the master server address.", 4, true); GlobalFuncs.ConsolePrint("-serverbrowseraddress <master server address> | Changes the master server address.", 4, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("How to launch:", 3, true); GlobalFuncs.ConsolePrint("How to launch:", 3, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("Create a shortcut to NovetusCMD in the bin folder of Novetus' Directory or", 4, 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); GlobalFuncs.ConsolePrint("create a batch file that launches NovetusCMD.", 4, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("Shortcuts", 3, true); GlobalFuncs.ConsolePrint("Shortcuts", 3, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("Right-click your shortcut and then go to Properties -> Shortcut.", 4, 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); 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); GlobalFuncs.ConsolePrint("Press space and then type in whatever arguments you please.", 4, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("Batch", 3, true); GlobalFuncs.ConsolePrint("Batch", 3, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("Click the end of where it says 'NovetusCMD.exe'", 4, 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); GlobalFuncs.ConsolePrint("Press space and then type in whatever arguments you please.", 4, true, true);
GlobalFuncs.ConsolePrint("---------", 1, true); GlobalFuncs.ConsolePrint("---------", 1, true, true);
GlobalFuncs.ConsolePrint("Press any key to close...", 2, true); GlobalFuncs.ConsolePrint("Press any key to close...", 2, true, true);
} }
} }
#endregion #endregion

33
Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
View File

@ -2177,15 +2177,23 @@ public class GlobalFuncs
} }
#if LAUNCHER #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) if (box == null)
return; return;
box.AppendText("[" + DateTime.Now.ToShortTimeString() + "] - ", Color.White); if (!noTime)
{
box.AppendText("[" + DateTime.Now.ToShortTimeString() + "] - ", Color.White);
}
switch (type) switch (type)
{ {
case 1:
box.AppendText(text, Color.White);
if (!noLog)
LogPrint(text);
break;
case 2: case 2:
box.AppendText(text, Color.Red); box.AppendText(text, Color.Red);
if (!noLog) if (!noLog)
@ -2211,9 +2219,9 @@ public class GlobalFuncs
if (!noLog) if (!noLog)
LogPrint(text); LogPrint(text);
break; break;
case 1: case 0:
default: default:
box.AppendText(text, Color.White); box.AppendText(text, Color.Black);
if (!noLog) if (!noLog)
LogPrint(text); LogPrint(text);
break; break;
@ -2222,7 +2230,7 @@ public class GlobalFuncs
box.AppendText(Environment.NewLine, Color.White); box.AppendText(Environment.NewLine, Color.White);
} }
#elif CMD #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) if (!notime)
{ {
@ -2233,24 +2241,29 @@ public class GlobalFuncs
{ {
case 2: case 2:
ConsoleText(text, ConsoleColor.Red); ConsoleText(text, ConsoleColor.Red);
LogPrint(text, 2); if (!noLog)
LogPrint(text, 2);
break; break;
case 3: case 3:
ConsoleText(text, ConsoleColor.Green); ConsoleText(text, ConsoleColor.Green);
LogPrint(text); if (!noLog)
LogPrint(text);
break; break;
case 4: case 4:
ConsoleText(text, ConsoleColor.Cyan); ConsoleText(text, ConsoleColor.Cyan);
LogPrint(text); if (!noLog)
LogPrint(text);
break; break;
case 5: case 5:
ConsoleText(text, ConsoleColor.Yellow); ConsoleText(text, ConsoleColor.Yellow);
LogPrint(text, 3); if (!noLog)
LogPrint(text, 3);
break; break;
case 1: case 1:
default: default:
ConsoleText(text, ConsoleColor.White); ConsoleText(text, ConsoleColor.White);
LogPrint(text); if (!noLog)
LogPrint(text);
break; break;
} }

33
Novetus/NovetusLauncher/Classes/Launcher/SplashLoader.cs
View File

@ -26,22 +26,6 @@ public class Splash
TextArray = text.Split('|'); TextArray = text.Split('|');
SplashText = TextArray[0]; SplashText = TextArray[0];
SplashContext = TextArray[1]; 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; IsSpecialSplash = specialSplashMode;
} }
else else
@ -50,6 +34,19 @@ public class Splash
SplashContext = ""; SplashContext = "";
} }
if (SplashText.Contains("[normal]"))
{
Compatibility = SplashCompatibility.Normal;
}
else if (SplashText.Contains("[stylish]"))
{
Compatibility = SplashCompatibility.Stylish;
}
else
{
Compatibility = SplashCompatibility.None;
}
SplashText = DecodeSplashString(SplashText); SplashText = DecodeSplashString(SplashText);
SplashContext = DecodeSplashString(SplashContext); SplashContext = DecodeSplashString(SplashContext);
@ -167,7 +164,9 @@ public class Splash
.Replace("%nextyear%", (now.Year + 1).ToString()) .Replace("%nextyear%", (now.Year + 1).ToString())
.Replace("%newline%", "\n") .Replace("%newline%", "\n")
.Replace("%branch%", GlobalVars.ProgramInformation.Branch) .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; } public string SplashText { get; set; }

36
Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
View File

@ -790,25 +790,23 @@ namespace NovetusLauncher
public void ConsoleHelp() public void ConsoleHelp()
{ {
GlobalFuncs.ConsolePrint("Help:", 3, ConsoleBox); GlobalFuncs.ConsolePrint("Help:", 3, ConsoleBox, true);
GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox); GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox, true);
GlobalFuncs.ConsolePrint("= client | Launches client with launcher settings", 4, ConsoleBox); 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); 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); 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); 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); 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); GlobalFuncs.ConsolePrint("= studio nomap | Launches Roblox Studio without the selected map", 4, ConsoleBox, true);
GlobalFuncs.ConsolePrint("= sdk | Launches the Novetus SDK Launcher", 4, ConsoleBox); GlobalFuncs.ConsolePrint("= sdk | Launches the Novetus SDK Launcher", 4, ConsoleBox, true);
GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox); GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox, true);
GlobalFuncs.ConsolePrint("= config save | Saves the config file", 4, ConsoleBox); GlobalFuncs.ConsolePrint("= config save | Saves the config file", 4, ConsoleBox, true);
GlobalFuncs.ConsolePrint("= config load | Reloads the config file", 4, ConsoleBox); GlobalFuncs.ConsolePrint("= config load | Reloads the config file", 4, ConsoleBox, true);
GlobalFuncs.ConsolePrint("= config reset | Resets the config file", 4, ConsoleBox); GlobalFuncs.ConsolePrint("= config reset | Resets the config file", 4, ConsoleBox, true);
GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox); GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox, true);
GlobalFuncs.ConsolePrint("= dlldelete off | Turn off the deletion of opengl32.dll when ReShade is off.", 4, ConsoleBox); 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); GlobalFuncs.ConsolePrint("= dlldelete on | Turn on the deletion of opengl32.dll when ReShade is off.", 4, ConsoleBox, true);
GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox); GlobalFuncs.ConsolePrint(LocalVars.important2, 0, ConsoleBox, true, true);
GlobalFuncs.ConsolePrint(LocalVars.important2, 1, ConsoleBox);
GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox);
} }
public void SwitchStyles() public void SwitchStyles()

10
Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs
View File

@ -632,7 +632,7 @@ public partial class AssetSDK : Form
switch (type) switch (type)
{ {
case RobloxFileType.RBXL: case RobloxFileType.RBXL:
typeFilter = "Roblox Level (*.rbxl)|*.rbxl|ROBLOX Level (*.rbxlx)|*.rbxlx"; typeFilter = "Roblox Level (*.rbxl)|*.rbxl|Roblox Level (*.rbxlx)|*.rbxlx";
break; break;
/*case RobloxFileType.Script: /*case RobloxFileType.Script:
typeFilter = "Lua Script (*.lua)|*.lua"; typeFilter = "Lua Script (*.lua)|*.lua";
@ -642,11 +642,9 @@ public partial class AssetSDK : Form
break; break;
} }
OpenFileDialog openFileDialog1 = new OpenFileDialog OpenFileDialog openFileDialog1 = new OpenFileDialog();
{ openFileDialog1.Filter = typeFilter;
Filter = typeFilter, openFileDialog1.Title = "Open Roblox level or model";
Title = "Open Roblox level or model",
};
return openFileDialog1; return openFileDialog1;
} }

12
changelog.txt
View File

@ -1,6 +1,16 @@
1.3 v12.2021.1 1.3 v12.2021.1
Changes from v11.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 1.3 v11.2021.1
Changes from Pre-Release 5: Changes from Pre-Release 5:

2
documentation.txt
View File

@ -18,7 +18,6 @@ General:
%args% - Default arguments provided by Novetus for launching clients. Use only this without any tags (except for <validate>) if you want default Novetus arguments. %args% - Default arguments provided by Novetus for launching clients. Use only this without any tags (except for <validate>) if you want default Novetus arguments.
%argstring% - Gets the default script arguments for a tag. %argstring% - Gets the default script arguments for a tag.
%ip% - Current IP address. %ip% - Current IP address.
%port% - Returns the port when hosting a server.
%addonscriptpath% - The path to an additional server script used by NovetusCMD. %addonscriptpath% - The path to an additional server script used by NovetusCMD.
%scripttype% - Returns the type of script we are using as a string. %scripttype% - Returns the type of script we are using as a string.
%version% - Returns Novetus' version. %version% - Returns Novetus' version.
@ -30,6 +29,7 @@ General:
Server: Server:
%limit% - Max Player limit. %limit% - Max Player limit.
%notifications% - Server join/leave notifications. %notifications% - Server join/leave notifications.
%port% - Returns the port when hosting a server.
Security: Security:
%md5launcher% - Generate a MD5 for the Novetus Launcher. %md5launcher% - Generate a MD5 for the Novetus Launcher.

3
scripts/game/2006S-Shaders/CSMPFunctions.lua
View File

@ -21,8 +21,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

3
scripts/game/2006S/CSMPFunctions.lua
View File

@ -21,8 +21,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

3
scripts/game/2007E-Shaders/CSMPFunctions.lua
View File

@ -21,8 +21,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

3
scripts/game/2007E/CSMPFunctions.lua
View File

@ -21,8 +21,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

3
scripts/game/2007M-Shaders/CSMPFunctions.lua
View File

@ -21,8 +21,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

3
scripts/game/2007M/CSMPFunctions.lua
View File

@ -21,8 +21,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

3
scripts/game/2008M/CSMPFunctions.lua
View File

@ -21,8 +21,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

3
scripts/game/2009E-HD/CSMPFunctions.lua
View File

@ -21,8 +21,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

3
scripts/game/2009E/CSMPFunctions.lua
View File

@ -21,8 +21,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

5
scripts/game/2010L/CSMPFunctions.lua
View File

@ -22,8 +22,11 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

3
scripts/game/2011E/CSMPFunctions.lua
View File

@ -26,8 +26,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

3
scripts/game/2011M/CSMPFunctions.lua
View File

@ -24,8 +24,9 @@ function KickPlayer(Player,reason)
if (Player ~= nil) then if (Player ~= nil) then
for _,Child in pairs(Server:children()) do for _,Child in pairs(Server:children()) do
name = "ServerReplicator|"..Player.Name.."|"..Player.userId.."|"..Player.AnonymousIdentifier.Value 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() Child:CloseConnection()
print("Player '" .. Player.Name .. "' Kicked. Reason: "..reason)
end end
end end
end end

4
scripts/launcher/splashes.txt
View File

@ -172,3 +172,7 @@ Not a metaverse!
IT WAS 99 CENTS! IT WAS 99 CENTS!
PRETTY PRETTY NINE!|DEATH GRIPS IS ONLINE! PRETTY PRETTY NINE!|DEATH GRIPS IS ONLINE!
I AM GONNA TAKE YOUR COAT|SAY THANKS 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.