From 65ab9f6a9cda3f4e4eb9887ee8cba8b6621a1eb5 Mon Sep 17 00:00:00 2001
From: Bitl <bitlblox@gmail.com>
Date: Thu, 23 Dec 2021 17:34:13 -0700
Subject: [PATCH] 2011 character loading fix.

---
 changelog.txt                        | 14 ++++++++++++++
 scripts/game/2010L/CSMPFunctions.lua |  6 ++----
 scripts/game/2011E/CSMPFunctions.lua | 11 +++++------
 scripts/game/2011M/CSMPFunctions.lua | 11 +++++------
 scripts/launcher/info.ini            |  2 +-
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index e8364fc..f102461 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,18 @@
 1.3 v?.2022.1
+Changes from v12.2021.2:
+New Features:
+
+Enhancements:
+
+Added items:
+Hats:
+- Snowman Teapot
+
+Fixes:
+- Fixed characters not loading up in medium to large size maps in 2011E and 2011M.
+
+Misc:
+
 ----------------------------------------------------------------------------
 1.3 v12.2021.2
 Changes from v12.2021.1:
diff --git a/scripts/game/2010L/CSMPFunctions.lua b/scripts/game/2010L/CSMPFunctions.lua
index 6b4d24a..c0d8d96 100644
--- a/scripts/game/2010L/CSMPFunctions.lua
+++ b/scripts/game/2010L/CSMPFunctions.lua
@@ -600,14 +600,12 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 			Player:LoadCharacter()
 		end
 		
-		Player.CharacterAdded:connect(function(char)
+		Player.CharacterAdded:connect(function(pchar)
 			LoadSecurity(newWaitForChildSecurity(Player,"Security"),Player,game.Lighting)
 			newWaitForChildSecurity(Player,"Tripcode")
 			LoadTripcode(Player)
 			pcall(function() print("Player '" .. Player.Name .. "-" .. Player.userId .. "' security check success. Tripcode: '" .. Player.Tripcode.Value .. "'") end)
-			if (char ~= nil) then
-				LoadCharacterNew(newWaitForChildSecurity(Player,"Appearance"),char)
-			end
+			LoadCharacterNew(newWaitForChildSecurity(Player,"Appearance"),pchar)
 		end)
 		
 		Player.Changed:connect(function(Property)
diff --git a/scripts/game/2011E/CSMPFunctions.lua b/scripts/game/2011E/CSMPFunctions.lua
index 6247202..62b4b84 100644
--- a/scripts/game/2011E/CSMPFunctions.lua
+++ b/scripts/game/2011E/CSMPFunctions.lua
@@ -621,17 +621,16 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 			if (showServerNotifications) then
 				game.Players:Chat("Player '" .. Player.Name .. "' joined")
 			end
-			
 			Player:LoadCharacter()
-			
+		end
+		
+		Player.CharacterAdded:connect(function(pchar)
 			LoadSecurity(newWaitForChildSecurity(Player,"Security"),Player,game.Lighting)
 			newWaitForChildSecurity(Player,"Tripcode")
 			LoadTripcode(Player)
 			pcall(function() print("Player '" .. Player.Name .. "-" .. Player.userId .. "' security check success. Tripcode: '" .. Player.Tripcode.Value .. "'") end)
-			if (Player.Character ~= nil) then
-				LoadCharacterNew(newWaitForChildSecurity(Player,"Appearance"),Player.Character)
-			end
-		end
+			LoadCharacterNew(newWaitForChildSecurity(Player,"Appearance"), pchar)
+		end)
 		
 		Player.Changed:connect(function(Property)
 			if (Player.Character~=nil) then
diff --git a/scripts/game/2011M/CSMPFunctions.lua b/scripts/game/2011M/CSMPFunctions.lua
index dddb857..070e063 100644
--- a/scripts/game/2011M/CSMPFunctions.lua
+++ b/scripts/game/2011M/CSMPFunctions.lua
@@ -627,17 +627,16 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 			if (showServerNotifications) then
 				game.Players:Chat("Player '" .. Player.Name .. "' joined")
 			end
-			
 			Player:LoadCharacter()
-			
+		end
+		
+		Player.CharacterAdded:connect(function(pchar)
 			LoadSecurity(newWaitForChildSecurity(Player,"Security"),Player,game.Lighting)
 			newWaitForChildSecurity(Player,"Tripcode")
 			LoadTripcode(Player)
 			pcall(function() print("Player '" .. Player.Name .. "-" .. Player.userId .. "' security check success. Tripcode: '" .. Player.Tripcode.Value .. "'") end)
-			if (Player.Character ~= nil) then
-				LoadCharacterNew(newWaitForChildSecurity(Player,"Appearance"), Player.Character)
-			end
-		end
+			LoadCharacterNew(newWaitForChildSecurity(Player,"Appearance"), pchar)
+		end)
 		
 		Player.Changed:connect(function(Property)
 			if (Player.Character~=nil) then
diff --git a/scripts/launcher/info.ini b/scripts/launcher/info.ini
index add09b4..ee8bfc5 100644
--- a/scripts/launcher/info.ini
+++ b/scripts/launcher/info.ini
@@ -9,4 +9,4 @@ ExtendedVersionEditChangelog=False
 ExtendedVersionTemplate=%version% v?.2022.%extended-revision%%lite%
 ExtendedVersionRevision=1
 IsLite=False
-InitialBootup=True
+InitialBootup=False