Skip to content

Commit 440904d

Browse files
committed
fix(server): fix deallocDecoration callname
1 parent 3452634 commit 440904d

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

api/AltV.Net.CApi/Libraries/ClientLibrary.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3565,7 +3565,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
35653565
public ClientLibrary(Dictionary<ulong, IntPtr> funcTable)
35663566
{
35673567
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
3568-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 18144996551249947726UL) Outdated = true;
3568+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 13630124142623987997UL) Outdated = true;
35693569
Audio_AddOutput = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<Audio_AddOutputDelegate>(funcTable, 9914412815391408844UL, Audio_AddOutputFallback);
35703570
Audio_GetBaseObject = (delegate* unmanaged[Cdecl]<nint, nint>) GetUnmanagedPtr<Audio_GetBaseObjectDelegate>(funcTable, 6330360502401226894UL, Audio_GetBaseObjectFallback);
35713571
Audio_GetCurrentTime = (delegate* unmanaged[Cdecl]<nint, double>) GetUnmanagedPtr<Audio_GetCurrentTimeDelegate>(funcTable, 2944324482134975819UL, Audio_GetCurrentTimeFallback);

api/AltV.Net.CApi/Libraries/ServerLibrary.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public unsafe interface IServerLibrary
165165
public delegate* unmanaged[Cdecl]<nint, byte, void> Player_ClearProps { get; }
166166
public delegate* unmanaged[Cdecl]<nint, void> Player_ClearTasks { get; }
167167
public delegate* unmanaged[Cdecl]<nint, void> Player_DeallocAmmoFlags { get; }
168-
public delegate* unmanaged[Cdecl]<nint, void> Player_DeallocVehicleModelInfo { get; }
168+
public delegate* unmanaged[Cdecl]<nint, void> Player_DeallocDecoration { get; }
169169
public delegate* unmanaged[Cdecl]<nint, nint, void> Player_DeleteLocalMetaData { get; }
170170
public delegate* unmanaged[Cdecl]<nint, void> Player_Despawn { get; }
171171
public delegate* unmanaged[Cdecl]<nint, uint, ushort> Player_GetAmmo { get; }
@@ -640,7 +640,7 @@ public unsafe class ServerLibrary : IServerLibrary
640640
public delegate* unmanaged[Cdecl]<nint, byte, void> Player_ClearProps { get; }
641641
public delegate* unmanaged[Cdecl]<nint, void> Player_ClearTasks { get; }
642642
public delegate* unmanaged[Cdecl]<nint, void> Player_DeallocAmmoFlags { get; }
643-
public delegate* unmanaged[Cdecl]<nint, void> Player_DeallocVehicleModelInfo { get; }
643+
public delegate* unmanaged[Cdecl]<nint, void> Player_DeallocDecoration { get; }
644644
public delegate* unmanaged[Cdecl]<nint, nint, void> Player_DeleteLocalMetaData { get; }
645645
public delegate* unmanaged[Cdecl]<nint, void> Player_Despawn { get; }
646646
public delegate* unmanaged[Cdecl]<nint, uint, ushort> Player_GetAmmo { get; }
@@ -1264,8 +1264,8 @@ public unsafe class ServerLibrary : IServerLibrary
12641264
private static void Player_ClearTasksFallback(nint _player) => throw new Exceptions.OutdatedSdkException("Player_ClearTasks", "Player_ClearTasks SDK method is outdated. Please update your module nuget");
12651265
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void Player_DeallocAmmoFlagsDelegate(nint _ammoFlags);
12661266
private static void Player_DeallocAmmoFlagsFallback(nint _ammoFlags) => throw new Exceptions.OutdatedSdkException("Player_DeallocAmmoFlags", "Player_DeallocAmmoFlags SDK method is outdated. Please update your module nuget");
1267-
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void Player_DeallocVehicleModelInfoDelegate(nint _decoInfo);
1268-
private static void Player_DeallocVehicleModelInfoFallback(nint _decoInfo) => throw new Exceptions.OutdatedSdkException("Player_DeallocVehicleModelInfo", "Player_DeallocVehicleModelInfo SDK method is outdated. Please update your module nuget");
1267+
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void Player_DeallocDecorationDelegate(nint _decoInfo);
1268+
private static void Player_DeallocDecorationFallback(nint _decoInfo) => throw new Exceptions.OutdatedSdkException("Player_DeallocDecoration", "Player_DeallocDecoration SDK method is outdated. Please update your module nuget");
12691269
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void Player_DeleteLocalMetaDataDelegate(nint _player, nint _key);
12701270
private static void Player_DeleteLocalMetaDataFallback(nint _player, nint _key) => throw new Exceptions.OutdatedSdkException("Player_DeleteLocalMetaData", "Player_DeleteLocalMetaData SDK method is outdated. Please update your module nuget");
12711271
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void Player_DespawnDelegate(nint _player);
@@ -1905,7 +1905,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
19051905
public ServerLibrary(Dictionary<ulong, IntPtr> funcTable)
19061906
{
19071907
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
1908-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 18144996551249947726UL) Outdated = true;
1908+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 13630124142623987997UL) Outdated = true;
19091909
BaseObject_DeleteSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<BaseObject_DeleteSyncedMetaDataDelegate>(funcTable, 8228424877092269355UL, BaseObject_DeleteSyncedMetaDataFallback);
19101910
BaseObject_SetMultipleSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint[], nint[], ulong, void>) GetUnmanagedPtr<BaseObject_SetMultipleSyncedMetaDataDelegate>(funcTable, 1390762125822890831UL, BaseObject_SetMultipleSyncedMetaDataFallback);
19111911
BaseObject_SetSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, nint, void>) GetUnmanagedPtr<BaseObject_SetSyncedMetaDataDelegate>(funcTable, 8002999088966424231UL, BaseObject_SetSyncedMetaDataFallback);
@@ -2060,7 +2060,7 @@ public ServerLibrary(Dictionary<ulong, IntPtr> funcTable)
20602060
Player_ClearProps = (delegate* unmanaged[Cdecl]<nint, byte, void>) GetUnmanagedPtr<Player_ClearPropsDelegate>(funcTable, 14293729102633233291UL, Player_ClearPropsFallback);
20612061
Player_ClearTasks = (delegate* unmanaged[Cdecl]<nint, void>) GetUnmanagedPtr<Player_ClearTasksDelegate>(funcTable, 2394928316223850939UL, Player_ClearTasksFallback);
20622062
Player_DeallocAmmoFlags = (delegate* unmanaged[Cdecl]<nint, void>) GetUnmanagedPtr<Player_DeallocAmmoFlagsDelegate>(funcTable, 17674808600712417948UL, Player_DeallocAmmoFlagsFallback);
2063-
Player_DeallocVehicleModelInfo = (delegate* unmanaged[Cdecl]<nint, void>) GetUnmanagedPtr<Player_DeallocVehicleModelInfoDelegate>(funcTable, 10260708090721922895UL, Player_DeallocVehicleModelInfoFallback);
2063+
Player_DeallocDecoration = (delegate* unmanaged[Cdecl]<nint, void>) GetUnmanagedPtr<Player_DeallocDecorationDelegate>(funcTable, 11055092498025975234UL, Player_DeallocDecorationFallback);
20642064
Player_DeleteLocalMetaData = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<Player_DeleteLocalMetaDataDelegate>(funcTable, 18350138927152444768UL, Player_DeleteLocalMetaDataFallback);
20652065
Player_Despawn = (delegate* unmanaged[Cdecl]<nint, void>) GetUnmanagedPtr<Player_DespawnDelegate>(funcTable, 10068978925729858744UL, Player_DespawnFallback);
20662066
Player_GetAmmo = (delegate* unmanaged[Cdecl]<nint, uint, ushort>) GetUnmanagedPtr<Player_GetAmmoDelegate>(funcTable, 6890209545812653225UL, Player_GetAmmoFallback);

api/AltV.Net.CApi/Libraries/SharedLibrary.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1665,7 +1665,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
16651665
public SharedLibrary(Dictionary<ulong, IntPtr> funcTable)
16661666
{
16671667
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
1668-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 18144996551249947726UL) Outdated = true;
1668+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 13630124142623987997UL) Outdated = true;
16691669
Audio_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<Audio_GetIDDelegate>(funcTable, 4464042055475980737UL, Audio_GetIDFallback);
16701670
AudioAttachedOutput_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioAttachedOutput_GetIDDelegate>(funcTable, 17725794901805112189UL, AudioAttachedOutput_GetIDFallback);
16711671
AudioFilter_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioFilter_GetIDDelegate>(funcTable, 8824535635529306325UL, AudioFilter_GetIDFallback);

api/AltV.Net/Elements/Entities/Player.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ public Decoration[] GetDecorations()
371371
var structure = Marshal.PtrToStructure<DecorationInternal>(ptr);
372372
decorations[i] = structure.ToPublic();
373373
}
374-
Core.Library.Shared.FreePlayerArray(ptr);
374+
Core.Library.Server.Player_DeallocDecoration(ptr);
375375
return decorations;
376376
}
377377
}

runtime

0 commit comments

Comments
 (0)