Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherrypick anti pull #1617 to release #1733

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions MainModule/Client/Core/Anti.luau
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,13 @@ return function(Vargs, GetEnv)
if NetworkClient and action ~= "_" then
pcall(Send, "D".."e".."t".."e".."c".."t".."e".."d", action, tostring(info)..(isXbox and " - On Xbox" or isMobile and " - On mobile" or ""))
task.wait(0.5)
if action == "k".."i".."c".."k" then
if not isStudio then
if nocrash then
Player:Kick(":"..":".." ".."A".."d".."o".."n".."i".."s".." ".."A".."n".."t".."i".." ".."C".."h".."e".."a".."t"..":"..":".."\n".. tostring(info)); -- service.Players.LocalPlayer
else
Disconnect(info)
end
if action == "k".."i".."c".."k" and not isStudio then
if nocrash then
Player:Kick(":"..":".." ".."A".."d".."o".."n".."i".."s".." ".."A".."n".."t".."i".." ".."C".."h".."e".."a".."t"..":"..":".."\n".. tostring(info)); -- service.Players.LocalPlayer
else
Disconnect(info)
end
elseif action == "c".."r".."a".."s".."h" then
elseif action == "c".."r".."a".."s".."h" and not isStudio then
Kill(info)
end
end
Expand Down Expand Up @@ -329,12 +327,12 @@ return function(Vargs, GetEnv)
pcall(metamethod, rawGame, proxyDetector)

if callstackInvalid or success or success2 or success3 then
return true
return not isStudio
elseif not errorMessages["namecallInstance"] then
errorMessages["namecallInstance"] = {err, err2, err3}
end

return not compareTables(errorMessages["namecallInstance"], {err, err2, err3})
return not compareTables(errorMessages["namecallInstance"], {err, err2, err3}) and not isStudio
end},
indexEnum = table.freeze{"kick", function()
local callstackInvalid = false
Expand Down