From c6907291b473a41182d911b575e8546b3db741c5 Mon Sep 17 00:00:00 2001
From: unittensor <brandon@rhpidfyre.io>
Date: Tue, 23 Apr 2024 20:01:12 -0400
Subject: [PATCH] fix editor entities and work on client respawning

---
 src/client/Character/init.lua      | 5 +++++
 src/client/CoreGuis.lua            | 5 ++++-
 src/client/init.client.lua         | 2 +-
 src/server/main/EditorEntities.lua | 2 +-
 src/server/main/init.server.lua    | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/client/Character/init.lua b/src/client/Character/init.lua
index 59a1d24..722802e 100644
--- a/src/client/Character/init.lua
+++ b/src/client/Character/init.lua
@@ -25,6 +25,7 @@ type Impl_Constructor = {
     __index: Impl_Constructor,
     constructor: Constructor_Fun,
     --Class functions
+    Spawned:             (self: ClassConstructor) -> (),
     CharacterKeyBinds:   (self: ClassConstructor) -> (),
     Crosshair:           (self: ClassConstructor) -> RBXScriptConnection,
     SetWalkSpeed:        (self: ClassConstructor) -> (),
@@ -93,6 +94,10 @@ function CharacterModule.constructor(Character)
     return setmetatable(self, CharacterModule)
 end
 
+function CharacterModule:Spawned()
+    self.SpineMovement = SpineModule.constructor(self.CharacterShared, self.CurrentCamera)
+end
+
 function CharacterModule:CharacterKeyBinds()
     local ClientBindMap = BindModule.constructor(false)
     local Actions       = ActionsModule.constructor(self.CharacterShared, self.HumanoidSettings, self.CurrentCamera, self.ActionsTCP)
diff --git a/src/client/CoreGuis.lua b/src/client/CoreGuis.lua
index 219c5ea..48d6740 100644
--- a/src/client/CoreGuis.lua
+++ b/src/client/CoreGuis.lua
@@ -26,6 +26,7 @@ CoreGuis.AllowBackpack   = false
 CoreGuis.AllowPlayerList = false
 
 local SG      = game:GetService("StarterGui")
+local RS      = game:GetService("RunService")
 local Players = game:GetService("Players")
 
 local function CustomCoreGuiEnums(): CustomCoreGuiEnums
@@ -81,7 +82,9 @@ function CoreGuis:Off()
 		end
 	end
 
-	ResetEnabled(CoreGuis.AllowReset)
+	if not RS:IsStudio() then
+		ResetEnabled(CoreGuis.AllowReset)
+	end
 end
 
 function CoreGuis:ForceOff()
diff --git a/src/client/init.client.lua b/src/client/init.client.lua
index fa034c8..01b5e62 100644
--- a/src/client/init.client.lua
+++ b/src/client/init.client.lua
@@ -10,7 +10,7 @@ local RS      = game:GetService("RunService")
 
 --Production--
 if not RS:IsStudio() then
-    task.wait(.5)
+    task.wait()
     script.Parent.Parent = nil
 end
 --
diff --git a/src/server/main/EditorEntities.lua b/src/server/main/EditorEntities.lua
index cee2c30..30b92c1 100644
--- a/src/server/main/EditorEntities.lua
+++ b/src/server/main/EditorEntities.lua
@@ -113,7 +113,7 @@ function StudioEntities.indexAll(enabled: boolean)
 		end
 	else
 		for i = 1, #StudioEntities.IndexedEntities do
-			local Entity: Instance = EditorEntities[i]
+			local Entity = EditorEntities[i]
 			EditorEntities[Entity.Name](Entity, enabled)
 		end
 	end
diff --git a/src/server/main/init.server.lua b/src/server/main/init.server.lua
index 0bab62d..08a1dcf 100644
--- a/src/server/main/init.server.lua
+++ b/src/server/main/init.server.lua
@@ -2,7 +2,7 @@
 --!native
 --!strict
 
-local ShowEditorEntities = game:GetService("RunService"):IsStudio()
+local ShowEditorEntities = true
 
 local Storage = game:GetService("ReplicatedStorage")