diff --git a/source b/source index a858c721..374aacfd 100644 --- a/source +++ b/source @@ -40,7 +40,7 @@ hookfunction = missing("function", hookfunction) hookmetamethod = missing("function", hookmetamethod) getnamecallmethod = missing("function", getnamecallmethod or get_namecall_method) checkcaller = missing("function", checkcaller, function() return false end) -newcclosure = missing("function", newcclosure) +newcclosure = missing("function", newcclosure, function(f, ...) return f(...) end) getgc = missing("function", getgc or get_gc_objects) setthreadidentity = missing("function", setthreadidentity or (syn and syn.set_thread_identity) or syn_context_set or setthreadcontext) replicatesignal = missing("function", replicatesignal) @@ -4497,7 +4497,7 @@ CMDs[#CMDs + 1] = {NAME = 'antigameplaypaused', DESC = 'Clears the annoying box CMDs[#CMDs + 1] = {NAME = 'unantigameplaypaused', DESC = 'Disables antigameplaypaused'} CMDs[#CMDs + 1] = {NAME = 'clientantikick / antikick (CLIENT)', DESC = 'Prevents localscripts from kicking you'} CMDs[#CMDs + 1] = {NAME = 'clientantiteleport / antiteleport (CLIENT)', DESC = 'Prevents localscripts from teleporting you'} -CMDs[#CMDs + 1] = {NAME = 'allowrejoin / allowrj [true/false] (CLIENT)', DESC = 'Changes if antiteleport allows you to rejoin or not'} +--CMDs[#CMDs + 1] = {NAME = 'allowrejoin / allowrj [true/false] (CLIENT)', DESC = 'Changes if antiteleport allows you to rejoin or not'} CMDs[#CMDs + 1] = {NAME = 'cancelteleport / canceltp', DESC = 'Cancels teleports in progress'} CMDs[#CMDs + 1] = {NAME = 'volume / vol [0-10]', DESC = 'Adjusts your game volume on a scale of 0 to 10'} CMDs[#CMDs + 1] = {NAME = 'antilag / boostfps / lowgraphics', DESC = 'Lowers game quality to boost FPS'} @@ -7871,20 +7871,25 @@ addcmd('clientantikick',{'antikick'},function(args, speaker) local oldhmmnc local oldKickFunction if hookfunction then - oldKickFunction = hookfunction(LocalPlayer.Kick, function() end) + oldKickFunction = hookfunction(LocalPlayer.Kick, newcclosure(function(...) + if select(1, ...) == speaker then + return + end + return oldKickFunction(...) + end)) end - oldhmmi = hookmetamethod(game, "__index", function(self, method) - if self == LocalPlayer and method:lower() == "kick" then + oldhmmi = hookmetamethod(game, "__index", newcclosure(function(self, method) + if self == LocalPlayer and method == "Kick" or method == "kick" then return error("Expected ':' not '.' calling member function Kick", 2) end return oldhmmi(self, method) - end) - oldhmmnc = hookmetamethod(game, "__namecall", function(self, ...) - if self == LocalPlayer and getnamecallmethod():lower() == "kick" then + end)) + oldhmmnc = hookmetamethod(game, "__namecall", newcclosure(function(self, ...) + if self == LocalPlayer and getnamecallmethod() == "Kick" or getnamecallmethod() == "kick" then return end return oldhmmnc(self, ...) - end) + end)) notify('Client Antikick','Client anti kick is now active (only effective on localscript kick)') end) @@ -7897,26 +7902,29 @@ addcmd('clientantiteleport',{'antiteleport'},function(args, speaker) local TeleportService = TeleportService local oldhmmi local oldhmmnc - oldhmmi = hookmetamethod(game, "__index", function(self, method) + oldhmmi = hookmetamethod(game, "__index", newcclosure(function(self, method) if self == TeleportService then - if method:lower() == "teleport" then + if method == "teleport" or method == "Teleport" then return error("Expected ':' not '.' calling member function Kick", 2) elseif method == "TeleportToPlaceInstance" then return error("Expected ':' not '.' calling member function TeleportToPlaceInstance", 2) end end return oldhmmi(self, method) - end) - oldhmmnc = hookmetamethod(game, "__namecall", function(self, ...) - if self == TeleportService and getnamecallmethod():lower() == "teleport" or getnamecallmethod() == "TeleportToPlaceInstance" then + end)) + oldhmmnc = hookmetamethod(game, "__namecall", newcclosure(function(self, ...) + local nmc = getnamecallmethod() + if self == TeleportService and nmc == "teleport" or nmc == "Teleport" or nmc == "TeleportToPlaceInstance" then return end return oldhmmnc(self, ...) - end) + end)) notify('Client AntiTP','Client anti teleport is now active (only effective on localscript teleport)') end) +--[[ +this literally does nothing? addcmd('allowrejoin',{'allowrj'},function(args, speaker) if args[1] and args[1] == 'false' then allow_rj = false @@ -7926,6 +7934,7 @@ addcmd('allowrejoin',{'allowrj'},function(args, speaker) notify('Client AntiTP','Allow rejoin set to true') end end) +]] addcmd("cancelteleport", {"canceltp"}, function(args, speaker) TeleportService:TeleportCancel()