Skip to content

fix(managed): Invalid ClassData creation on null returns from Core #110

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 20, 2025
Merged

fix(managed): Invalid ClassData creation on null returns from Core #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b60343
partial-fix(managed): fix IsFakeClient check
blu133721 Aug 20, 2025
4d20529
fix(managed): Invalid instance creation on ClassData
blu133721 Aug 20, 2025
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
4 changes: 2 additions & 2 deletions src/managed/API/Scripting/Generic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public static Player[] FindPlayersByTarget(string target, bool matchbots)
Player? player = GetPlayer(i);
if (player == null) continue;

if (player.IsFakeClient() && !matchbots) continue;
if (!matchbots && player.IsFakeClient()) continue;

if(target == "@all")
{
Expand Down Expand Up @@ -273,7 +273,7 @@ public static Player[] FindPlayersByTarget(string target, bool matchbots)
}
public static Player? GetPlayer(int playerid)
{
return Internal_API.Invoker.CallNative<Player?>("_G", "GetPlayer", Internal_API.CallKind.Function, playerid);
return Internal_API.Invoker.CallNative<Player>("_G", "GetPlayer", Internal_API.CallKind.Function, playerid);
}
public static ulong GetTime()
{
Expand Down
12 changes: 11 additions & 1 deletion src/managed/Internal_API/CallContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,17 @@ internal unsafe object GetArgument(Type type, int index)
{
fixed (CallData* data = &m_cdata)
{
if (data->has_return == 0) return Activator.CreateInstance(type);
if (data->has_return == 0)
{
if (type == typeof(ClassData) || typeof(ClassData).IsAssignableFrom(type))
{
return null;
}
else
{
return Activator.CreateInstance(type);
}
}
byte* p = data->return_value;
return ReadValue(ref type, ref p);
}
Expand Down
Loading