Merge pull request #1864 from Epix-Incorporated/master

Merge master into release

Author: Dimenpsyonal

.github/workflows/lint.yml

@@ -21,7 +21,7 @@ jobs:
 
     - name: Cache Roblox Standard Library
       id: cache-roblox-std
-      uses: actions/cache@v4.0.2
+      uses: actions/cache@v4.2.2
       with:
         path: roblox.yml
         key: roblox-std

Loader/Version.model.json

@@ -1,6 +1,6 @@
 {
 	"ClassName": "NumberValue",
 	"Properties": {
-		"Value": 264
+		"Value": 265
 	}
 }

MainModule/Client/Client.luau

@@ -128,10 +128,10 @@ end
 --// Logging
 local clientLog = {}
 local dumplog = function()
-	warn("Dumping client log...")
+	print("Dumping client log...")
 
 	for _, v in clientLog do
-		warn(v)
+		print(v)
 	end
 end
 local log = function(...)
@@ -142,7 +142,7 @@ end
 local isStudio = game:GetService("RunService"):IsStudio()
 game:GetService("NetworkClient").ChildRemoved:Connect(function(p)
 	if not isStudio then
-		warn("~! PLAYER DISCONNECTED/KICKED! DUMPING ADONIS CLIENT LOG!")
+		print("~! PLAYER DISCONNECTED/KICKED! DUMPING ADONIS CLIENT LOG!")
 		dumplog()
 	end
 end)
@@ -222,12 +222,18 @@ do
 		if not isStudio then
 			spawn(pcall, function()
 				task.wait(5)
-				while true do
-					pcall(task.spawn, function()
-						task.spawn(Kill())
-						-- memes
-					end)
+				if client.Core and client.Core.RemoteEvent then
+					spawn(pcall, table.clear, client.Core.RemoteEvent)
+					spawn(pcall, table.freeze, client.Core.RemoteEvent)
+					client.Core.RemoteEvent = nil
 				end
+
+				spawn(pcall, table.clear, locals)
+				spawn(pcall, table.freeze, locals)
+				client = nil
+				locals = nil
+
+				while true do continue end
 			end)
 		end
 	end)

MainModule/Client/Core/Functions.luau

@@ -196,7 +196,7 @@ return function(Vargs, GetEnv)
 		SetView = function(ob)
 			local CurrentCamera = workspace.CurrentCamera
 
-			if ob == "reset" then
+			if ob == "reset" and service.Player.Character then
 				CurrentCamera.CameraType = Enum.CameraType.Custom
 				CurrentCamera.CameraSubject = service.Player.Character:FindFirstChildOfClass("Humanoid")
 				CurrentCamera.FieldOfView = 70
@@ -1415,6 +1415,13 @@ return function(Vargs, GetEnv)
 			end
 		end;
 
+		Unfly = function()
+			local Humanoid: Humanoid = service.Player.Character and service.Player.Character:FindFirstChildOfClass("Humanoid")
+			if Humanoid then
+				Humanoid.PlatformStand = false
+			end
+		end;
+
 		SetCoreGuiEnabled = function(element,enabled)
 			service.StarterGui:SetCoreGuiEnabled(element,enabled)
 		end;
@@ -1429,7 +1436,7 @@ return function(Vargs, GetEnv)
 		end;
 
 		Cape = function(material,color,decal,reflect)
-			local torso = service.Player.Character:FindFirstChild("HumanoidRootPart")
+			local torso = service.Player.Character and service.Player.Character:FindFirstChild("HumanoidRootPart")
 			if torso then
 				local p = service.New("Part",service.LocalContainer())
 				p.Name = "::Adonis::Cape"

MainModule/Server/Commands/Fun.luau

@@ -1104,7 +1104,7 @@ return function(Vargs, env)
 			AdminLevel = "Moderators";
 			Fun = true;
 			Function = function(plr: Player, args: {string})
-				local sword = service.Insert(125013769)
+				local sword = server.Deps.Assets.LinkedSword
 				local config = sword:FindFirstChild("Configurations")
 				if config then
 					config.CanTeamkill.Value = if args[2] and args[2]:lower() == "false" then false else true
@@ -1389,7 +1389,7 @@ return function(Vargs, env)
 				local img = tostring(args[2])
 				if not img then error(`{args[2]} is not a valid ID`) end
 				for i, v in service.GetPlayers(plr, args[1]) do
-					Remote.MakeGui(v, "Effect", {Mode = "ScreenVideo"; video = args[2];})
+					Remote.MakeGui(v, "Effect", {Mode = "ScreenVideo"; Video = args[2];})
 				end
 			end
 		};

MainModule/Server/Commands/Moderators.luau

@@ -91,7 +91,9 @@ return function(Vargs, env)
 						plr.Character.Humanoid.Sit = false
 						plr.Character.Humanoid.Jump = true
 					end
-					wait()
+					Variables.ReturnPoints[plr] = plr.Character.HumanoidRootPart.CFrame
+					
+					task.wait()
 					plr.Character:PivotTo(plr.Character:GetPivot() * CFrame.new(0, 0, -5))
 				end
 			end
@@ -4638,10 +4640,12 @@ return function(Vargs, env)
 								FlightPos.Position = root.Position
 								FlightGyro.CFrame = root.CFrame
 							end
-
+							
+							Variables.ReturnPoints[v] = root.CFrame
+							
 							task.wait()
 
-							if root then
+							if root then		
 								root.CFrame = CFrame.new(point)
 								if FlightPos and FlightGyro then
 									FlightPos.Position = root.Position
@@ -4685,7 +4689,9 @@ return function(Vargs, env)
 							FlightPos.Position = root.Position
 							FlightGyro.CFrame = root.CFrame
 						end
-
+						
+						Variables.ReturnPoints[v] = root.CFrame
+						
 						task.wait()
 
 						root.CFrame = CFrame.new(Vector3.new(tonumber(x), tonumber(y), tonumber(z)))
@@ -4728,7 +4734,9 @@ return function(Vargs, env)
 								FlightPos.Position = root.Position
 								FlightGyro.CFrame = root.CFrame
 							end
-
+							
+							Variables.ReturnPoints[v] = root.CFrame
+							
 							task.wait()
 
 							root.CFrame = (target.Character.HumanoidRootPart.CFrame*CFrame.Angles(0, math.rad(90/#players*1), 0)*CFrame.new(5+.2*#players, 0, 0))*CFrame.Angles(0, math.rad(90), 0)
@@ -4773,7 +4781,9 @@ return function(Vargs, env)
 										FlightPos.Position = root.Position
 										FlightGyro.CFrame = root.CFrame
 									end
-
+									
+									Variables.ReturnPoints[v] = root.CFrame
+									
 									task.wait()
 
 									if root and targ_root then
@@ -4826,6 +4836,22 @@ return function(Vargs, env)
 				Commands.Teleport.Function(plr, {`@{plr.Name}`, if args[1] then args[1] else "me"})
 			end
 		};
+		
+		Return = {
+			Prefix = Settings.Prefix;
+			Commands = {"return"};
+			Args = {"player"};
+			Description = "Returns the player to their original position";
+			AdminLevel = "Moderators";
+			Function = function(plr: Player, args: {string})
+				for i, player in service.GetPlayers(plr, args[1]) do
+					if Variables.ReturnPoints[player] then
+						player.Character.HumanoidRootPart.CFrame = Variables.ReturnPoints[player]
+						Variables.ReturnPoints[player] = nil;
+					end
+				end
+			end
+		};
 
 		MassBring = {
 			Prefix = Settings.Prefix;
@@ -4868,6 +4894,8 @@ return function(Vargs, env)
 						task.wait()
 
 						local rootPart = char:FindFirstChild("HumanoidRootPart")
+						Variables.ReturnPoints[players[i]] = rootPart.CFrame
+						
 						if rootPart then
 							rootPart.CFrame = (
 								plrRootPart.CFrame
@@ -4902,6 +4930,8 @@ return function(Vargs, env)
 						task.wait()
 
 						local rootPart = char:FindFirstChild("HumanoidRootPart")
+						Variables.ReturnPoints[players[i]] = rootPart.CFrame
+						
 						if rootPart then
 							rootPart.CFrame = (
 								plrRootPart.CFrame
@@ -5977,7 +6007,7 @@ return function(Vargs, env)
 				scr.Name = "ADONIS_FLIGHT"
 
 				for i, v in service.GetPlayers(plr, args[1]) do
-					local part = v.Character:FindFirstChild("HumanoidRootPart")
+					local part = v.Character and v.Character:FindFirstChild("HumanoidRootPart")
 					if part then
 						local oldp = part:FindFirstChild("ADONIS_FLIGHT_POSITION")
 						local oldpa = part:FindFirstChild("ADONIS_FLIGHT_POSITION_ATTACHMENT")
@@ -5988,33 +6018,33 @@ return function(Vargs, env)
 						if oldpa then oldpa:Destroy() end
 						if oldg then oldg:Destroy() end
 						if oldga then oldga:Destroy() end
-						if olds then olds:Destroy() end
+						if olds then Remote.Send(v, "Function", "Unfly") olds:Destroy() end
 
 						local new = scr:Clone()
-						local flightPositionAttachment: Attachment = service.New("Attachment")
-						local flightGyroAttachment: Attachment = service.New("Attachment")
-						local flightPosition: AlignPosition = service.New("AlignPosition")
-						local flightGyro: AlignOrientation = service.New("AlignOrientation")
-
-						flightPositionAttachment.Name = "ADONIS_FLIGHT_POSITION_ATTACHMENT"
-						flightPositionAttachment.Parent = part
-
-						flightGyroAttachment.Name = "ADONIS_FLIGHT_GYRO_ATTACHMENT"
-						flightGyroAttachment.Parent = part
-
-						flightPosition.Name = "ADONIS_FLIGHT_POSITION"
-						flightPosition.MaxForce = 0
-						flightPosition.Position = part.Position
-						flightPosition.Attachment0 = flightPositionAttachment
-						flightPosition.Mode = Enum.PositionAlignmentMode.OneAttachment
-						flightPosition.Parent = part
-
-						flightGyro.Name = "ADONIS_FLIGHT_GYRO"
-						flightGyro.MaxTorque = 0
-						flightGyro.CFrame = part.CFrame
-						flightGyro.Attachment0 = flightGyroAttachment
-						flightGyro.Mode = Enum.OrientationAlignmentMode.OneAttachment
-						flightGyro.Parent = part
+						local flightPositionAttachment: Attachment = service.New("Attachment", {
+							Name = "ADONIS_FLIGHT_POSITION_ATTACHMENT",
+							Parent = part
+						})
+						local flightGyroAttachment: Attachment = service.New("Attachment", {
+							Name = "ADONIS_FLIGHT_GYRO_ATTACHMENT",
+							Parent = part
+						})
+						local flightPosition: AlignPosition = service.New("AlignPosition", {
+							Name = "ADONIS_FLIGHT_POSITION",
+							MaxForce = 0,
+							Position = part.Position,
+							Attachment0 = flightPositionAttachment,
+							Mode = Enum.PositionAlignmentMode.OneAttachment,
+							Parent = part
+						})
+						local flightGyro: AlignOrientation = service.New("AlignOrientation", {
+							Name = "ADONIS_FLIGHT_GYRO",
+							MaxTorque = 0,
+							CFrame = part.CFrame,
+							Attachment0 = flightGyroAttachment,
+							Mode = Enum.OrientationAlignmentMode.OneAttachment,
+							Parent = part
+						})
 
 						new.Parent = part
 						new.Disabled = false
@@ -6060,7 +6090,7 @@ return function(Vargs, env)
 			AdminLevel = "Moderators";
 			Function = function(plr: Player, args: {string})
 				for _, v in service.GetPlayers(plr, args[1]) do
-					local part = v.Character:FindFirstChild("HumanoidRootPart")
+					local part = v.Character and v.Character:FindFirstChild("HumanoidRootPart")
 					if part then
 						local oldp = part:FindFirstChild("ADONIS_FLIGHT_POSITION")
 						local oldpa = part:FindFirstChild("ADONIS_FLIGHT_POSITION_ATTACHMENT")
@@ -6071,7 +6101,7 @@ return function(Vargs, env)
 						if oldpa then oldpa:Destroy() end
 						if oldg then oldg:Destroy() end
 						if oldga then oldga:Destroy() end
-						if olds then olds:Destroy() end
+						if olds then Remote.Send(v, "Function", "Unfly") olds:Destroy() end
 					end
 				end
 			end
@@ -7140,5 +7170,83 @@ return function(Vargs, env)
 				})
 			end
 		};
+
+		StarterHealth = {
+			Prefix = Settings.Prefix;
+			Commands = {"starterhealth", "starthealth", "persisthealth"};
+			Args = {"player", "health"};
+			Description = "Sets the target player(s)'s starting health";
+			AdminLevel = "Moderators";
+			Function = function(plr: Player, args: {string})
+				local health = tonumber(args[2])
+				assert(health, "Invalid health value")
+				local plrs = service.GetPlayers(plr, args[1])
+				for _, v in plrs do
+					server.Variables.Starter.Health[tostring(v.UserId)] = health
+				end
+				Functions.Hint(`Your starter health was set to {health}`, plrs)
+				if Settings.CommandFeedback then
+					Functions.Hint(`You set {#plrs} players starter health to {health}`, {plr})
+				end
+			end
+
+		},
+
+		UnStarterHealth = {
+			Prefix = Settings.Prefix;
+			Commands = {"unstarterhealth", "unstarthealth", "resetstarterhealth", "unpersisthealth"};
+			Args = {"player"};
+			Description = "Removes the target player(s)'s custom starting health";
+			AdminLevel = "Moderators";
+			Function = function(plr: Player, args: {string})
+				local plrs = service.GetPlayers(plr, args[1])
+				for _, v in plrs do
+					server.Variables.Starter.Health[tostring(v.UserId)] = nil
+				end
+				Functions.Hint(`Your starter health was reset`, plrs)
+				if Settings.CommandFeedback then
+					Functions.Hint(`You reset {#plrs} players starter health`, {plr})
+				end
+			end
+		};
+
+		StarterSpeed = {
+			Prefix = Settings.Prefix;
+			Commands = {"starterspeed", "startspeed", "persistspeed"};
+			Args = {"player", "speed"};
+			Description = "Sets the target player(s)'s starting speed";
+			AdminLevel = "Moderators";
+			Function = function(plr: Player, args: {string})
+				local speed = tonumber(args[2])
+				assert(speed, "Invalid speed value")
+				local plrs = service.GetPlayers(plr, args[1])
+				for _, v in plrs do
+					server.Variables.Starter.Speed[tostring(v.UserId)] = speed
+				end
+
+				Functions.Hint(`Your starter speed was set to {speed}`, plrs)
+				if Settings.CommandFeedback then
+					Functions.Hint(`You set {#plrs} players starter speed to {speed}`, {plr})
+				end
+			end
+		};
+
+		UnStarterSpeed = {
+			Prefix = Settings.Prefix;
+			Commands = {"unstarterspeed", "unstartspeed", "resetstarterspeed", "unpersistspeed"};
+			Args = {"player"};
+			Description = "Removes the target player(s)'s custom starting speed";
+			AdminLevel = "Moderators";
+			Function = function(plr: Player, args: {string})
+				local plrs = service.GetPlayers(plr, args[1])
+				for _, v in plrs do
+					server.Variables.Starter.Speed[tostring(v.UserId)] = nil
+				end
+				Functions.Hint(`Your starter speed was reset`, plrs)
+				if Settings.CommandFeedback then
+					Functions.Hint(`You reset {#plrs} players starter speed`, {plr})
+				end
+			end
+		};
 	}
 end

MainModule/Server/Commands/Players.luau

@@ -34,6 +34,8 @@ return function(Vargs, env)
 							table.insert(cmdAliases, `and {#cmd.Commands - #cmdAliases} more...`)
 							break
 						end
+
+						table.insert(cmdAliases, alias)
 					end
 
 					table.remove(cmdAliases, 1)