Skip to content

Commit 9489531

Browse files
DoxohDoxoh
committed
Merge branch 'dev' into rc
2 parents b5d5959 + 9b71a54 commit 9489531

File tree

7 files changed

+72
-33
lines changed

7 files changed

+72
-33
lines changed

‎api/AltV.Net.Async/Elements/Entities/AsyncEntity.cs‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public IPlayer NetworkOwner
2828
}
2929
}
3030
}
31+
3132
ISharedPlayer ISharedEntity.NetworkOwner => NetworkOwner;
3233

3334
public Rotation Rotation
@@ -40,7 +41,8 @@ public Rotation Rotation
4041
return Entity.Rotation;
4142
}
4243
}
43-
set {
44+
set
45+
{
4446
lock (Entity)
4547
{
4648
if (!AsyncContext.CheckIfExistsNullable(Entity)) return;
@@ -71,7 +73,8 @@ public bool Visible
7173
return Entity.Visible;
7274
}
7375
}
74-
set {
76+
set
77+
{
7578
lock (Entity)
7679
{
7780
if (!AsyncContext.CheckIfExistsNullable(Entity)) return;
@@ -90,7 +93,8 @@ public bool Streamed
9093
return Entity.Streamed;
9194
}
9295
}
93-
set {
96+
set
97+
{
9498
lock (Entity)
9599
{
96100
if (!AsyncContext.CheckIfExistsNullable(Entity)) return;
@@ -237,7 +241,8 @@ public void DeleteStreamSyncedMetaData(string key)
237241
}
238242
}
239243

240-
public void AttachToEntity(IEntity entity, ushort otherBoneId, ushort ownBoneId, Position position, Rotation rotation,
244+
public void AttachToEntity(IEntity entity, ushort otherBoneId, ushort ownBoneId, Position position,
245+
Rotation rotation,
241246
bool collision, bool noFixedRotation)
242247
{
243248
lock (Entity)
@@ -247,7 +252,8 @@ public void AttachToEntity(IEntity entity, ushort otherBoneId, ushort ownBoneId,
247252
}
248253
}
249254

250-
public void AttachToEntity(IEntity entity, string otherBone, string ownBone, Position position, Rotation rotation,
255+
public void AttachToEntity(IEntity entity, string otherBone, string ownBone, Position position,
256+
Rotation rotation,
251257
bool collision, bool noFixedRotation)
252258
{
253259
lock (Entity)
@@ -288,6 +294,14 @@ public uint StreamingDistance
288294
return Entity.StreamingDistance;
289295
}
290296
}
297+
set
298+
{
299+
lock (Entity)
300+
{
301+
if (!AsyncContext.CheckIfExistsNullable(Entity)) return;
302+
Entity.StreamingDistance = value;
303+
}
304+
}
291305
}
292306

293307
public bool Frozen
@@ -300,7 +314,8 @@ public bool Frozen
300314
return Entity.Frozen;
301315
}
302316
}
303-
set {
317+
set
318+
{
304319
lock (Entity)
305320
{
306321
if (!AsyncContext.CheckIfExistsNullable(Entity)) return;
@@ -319,7 +334,8 @@ public bool Collision
319334
return Entity.Collision;
320335
}
321336
}
322-
set {
337+
set
338+
{
323339
lock (Entity)
324340
{
325341
if (!AsyncContext.CheckIfExistsNullable(Entity)) return;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ public unsafe interface IClientLibrary
886886

887887
public unsafe class ClientLibrary : IClientLibrary
888888
{
889-
public readonly uint Methods = 1726;
889+
public readonly uint Methods = 1727;
890890
public delegate* unmanaged[Cdecl]<nint, nint, void> Audio_AddOutput { get; }
891891
public delegate* unmanaged[Cdecl]<nint, nint> Audio_GetBaseObject { get; }
892892
public delegate* unmanaged[Cdecl]<nint, double> Audio_GetCurrentTime { get; }
@@ -3512,7 +3512,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
35123512
public ClientLibrary(Dictionary<ulong, IntPtr> funcTable)
35133513
{
35143514
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
3515-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 10237860134860447738UL) Outdated = true;
3515+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 1329516003325097705UL) Outdated = true;
35163516
Audio_AddOutput = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<Audio_AddOutputDelegate>(funcTable, 9914412815391408844UL, Audio_AddOutputFallback);
35173517
Audio_GetBaseObject = (delegate* unmanaged[Cdecl]<nint, nint>) GetUnmanagedPtr<Audio_GetBaseObjectDelegate>(funcTable, 6330360502401226894UL, Audio_GetBaseObjectFallback);
35183518
Audio_GetCurrentTime = (delegate* unmanaged[Cdecl]<nint, double>) GetUnmanagedPtr<Audio_GetCurrentTimeDelegate>(funcTable, 2944324482134975819UL, Audio_GetCurrentTimeFallback);

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public unsafe interface IServerLibrary
133133
public delegate* unmanaged[Cdecl]<nint, nint[], nint[], ulong, void> Entity_SetMultipleStreamSyncedMetaData { get; }
134134
public delegate* unmanaged[Cdecl]<nint, nint, byte, void> Entity_SetNetOwner { get; }
135135
public delegate* unmanaged[Cdecl]<nint, byte, void> Entity_SetStreamed { get; }
136+
public delegate* unmanaged[Cdecl]<nint, uint, void> Entity_SetStreamingDistance { get; }
136137
public delegate* unmanaged[Cdecl]<nint, nint, nint, void> Entity_SetStreamSyncedMetaData { get; }
137138
public delegate* unmanaged[Cdecl]<nint, byte, void> Entity_SetVisible { get; }
138139
public delegate* unmanaged[Cdecl]<nint, uint, void> Event_WeaponDamageEvent_SetDamageValue { get; }
@@ -471,7 +472,7 @@ public unsafe interface IServerLibrary
471472

472473
public unsafe class ServerLibrary : IServerLibrary
473474
{
474-
public readonly uint Methods = 1726;
475+
public readonly uint Methods = 1727;
475476
public delegate* unmanaged[Cdecl]<nint, nint, void> BaseObject_DeleteSyncedMetaData { get; }
476477
public delegate* unmanaged[Cdecl]<nint, nint[], nint[], ulong, void> BaseObject_SetMultipleSyncedMetaData { get; }
477478
public delegate* unmanaged[Cdecl]<nint, nint, nint, void> BaseObject_SetSyncedMetaData { get; }
@@ -595,6 +596,7 @@ public unsafe class ServerLibrary : IServerLibrary
595596
public delegate* unmanaged[Cdecl]<nint, nint[], nint[], ulong, void> Entity_SetMultipleStreamSyncedMetaData { get; }
596597
public delegate* unmanaged[Cdecl]<nint, nint, byte, void> Entity_SetNetOwner { get; }
597598
public delegate* unmanaged[Cdecl]<nint, byte, void> Entity_SetStreamed { get; }
599+
public delegate* unmanaged[Cdecl]<nint, uint, void> Entity_SetStreamingDistance { get; }
598600
public delegate* unmanaged[Cdecl]<nint, nint, nint, void> Entity_SetStreamSyncedMetaData { get; }
599601
public delegate* unmanaged[Cdecl]<nint, byte, void> Entity_SetVisible { get; }
600602
public delegate* unmanaged[Cdecl]<nint, uint, void> Event_WeaponDamageEvent_SetDamageValue { get; }
@@ -1175,6 +1177,8 @@ public unsafe class ServerLibrary : IServerLibrary
11751177
private static void Entity_SetNetOwnerFallback(nint _entity, nint _networkOwnerPlayer, byte _disableMigration) => throw new Exceptions.OutdatedSdkException("Entity_SetNetOwner", "Entity_SetNetOwner SDK method is outdated. Please update your module nuget");
11761178
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void Entity_SetStreamedDelegate(nint _entity, byte _state);
11771179
private static void Entity_SetStreamedFallback(nint _entity, byte _state) => throw new Exceptions.OutdatedSdkException("Entity_SetStreamed", "Entity_SetStreamed SDK method is outdated. Please update your module nuget");
1180+
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void Entity_SetStreamingDistanceDelegate(nint _entity, uint _streamingDistance);
1181+
private static void Entity_SetStreamingDistanceFallback(nint _entity, uint _streamingDistance) => throw new Exceptions.OutdatedSdkException("Entity_SetStreamingDistance", "Entity_SetStreamingDistance SDK method is outdated. Please update your module nuget");
11781182
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void Entity_SetStreamSyncedMetaDataDelegate(nint _entity, nint _key, nint _val);
11791183
private static void Entity_SetStreamSyncedMetaDataFallback(nint _entity, nint _key, nint _val) => throw new Exceptions.OutdatedSdkException("Entity_SetStreamSyncedMetaData", "Entity_SetStreamSyncedMetaData SDK method is outdated. Please update your module nuget");
11801184
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void Entity_SetVisibleDelegate(nint _entity, byte _state);
@@ -1852,7 +1856,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
18521856
public ServerLibrary(Dictionary<ulong, IntPtr> funcTable)
18531857
{
18541858
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
1855-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 10237860134860447738UL) Outdated = true;
1859+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 1329516003325097705UL) Outdated = true;
18561860
BaseObject_DeleteSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<BaseObject_DeleteSyncedMetaDataDelegate>(funcTable, 8228424877092269355UL, BaseObject_DeleteSyncedMetaDataFallback);
18571861
BaseObject_SetMultipleSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint[], nint[], ulong, void>) GetUnmanagedPtr<BaseObject_SetMultipleSyncedMetaDataDelegate>(funcTable, 1390762125822890831UL, BaseObject_SetMultipleSyncedMetaDataFallback);
18581862
BaseObject_SetSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, nint, void>) GetUnmanagedPtr<BaseObject_SetSyncedMetaDataDelegate>(funcTable, 8002999088966424231UL, BaseObject_SetSyncedMetaDataFallback);
@@ -1976,6 +1980,7 @@ public ServerLibrary(Dictionary<ulong, IntPtr> funcTable)
19761980
Entity_SetMultipleStreamSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint[], nint[], ulong, void>) GetUnmanagedPtr<Entity_SetMultipleStreamSyncedMetaDataDelegate>(funcTable, 5985306302153035853UL, Entity_SetMultipleStreamSyncedMetaDataFallback);
19771981
Entity_SetNetOwner = (delegate* unmanaged[Cdecl]<nint, nint, byte, void>) GetUnmanagedPtr<Entity_SetNetOwnerDelegate>(funcTable, 6937824812303569788UL, Entity_SetNetOwnerFallback);
19781982
Entity_SetStreamed = (delegate* unmanaged[Cdecl]<nint, byte, void>) GetUnmanagedPtr<Entity_SetStreamedDelegate>(funcTable, 6004628797499736605UL, Entity_SetStreamedFallback);
1983+
Entity_SetStreamingDistance = (delegate* unmanaged[Cdecl]<nint, uint, void>) GetUnmanagedPtr<Entity_SetStreamingDistanceDelegate>(funcTable, 13173445283048314724UL, Entity_SetStreamingDistanceFallback);
19791984
Entity_SetStreamSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, nint, void>) GetUnmanagedPtr<Entity_SetStreamSyncedMetaDataDelegate>(funcTable, 12798418058428333585UL, Entity_SetStreamSyncedMetaDataFallback);
19801985
Entity_SetVisible = (delegate* unmanaged[Cdecl]<nint, byte, void>) GetUnmanagedPtr<Entity_SetVisibleDelegate>(funcTable, 8026011842118229214UL, Entity_SetVisibleFallback);
19811986
Event_WeaponDamageEvent_SetDamageValue = (delegate* unmanaged[Cdecl]<nint, uint, void>) GetUnmanagedPtr<Event_WeaponDamageEvent_SetDamageValueDelegate>(funcTable, 18440396865533386791UL, Event_WeaponDamageEvent_SetDamageValueFallback);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ public unsafe interface ISharedLibrary
409409

410410
public unsafe class SharedLibrary : ISharedLibrary
411411
{
412-
public readonly uint Methods = 1726;
412+
public readonly uint Methods = 1727;
413413
public delegate* unmanaged[Cdecl]<nint, uint> Audio_GetID { get; }
414414
public delegate* unmanaged[Cdecl]<nint, uint> AudioAttachedOutput_GetID { get; }
415415
public delegate* unmanaged[Cdecl]<nint, uint> AudioFilter_GetID { get; }
@@ -1604,7 +1604,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
16041604
public SharedLibrary(Dictionary<ulong, IntPtr> funcTable)
16051605
{
16061606
if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
1607-
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 10237860134860447738UL) Outdated = true;
1607+
else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 1329516003325097705UL) Outdated = true;
16081608
Audio_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<Audio_GetIDDelegate>(funcTable, 4464042055475980737UL, Audio_GetIDFallback);
16091609
AudioAttachedOutput_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioAttachedOutput_GetIDDelegate>(funcTable, 17725794901805112189UL, AudioAttachedOutput_GetIDFallback);
16101610
AudioFilter_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioFilter_GetIDDelegate>(funcTable, 8824535635529306325UL, AudioFilter_GetIDFallback);

0 commit comments

Comments
 (0)