Skip to content

Commit ba612d1

Browse files
committed
fix(shared): make BaseObject Id gettable
1 parent 7f0891f commit ba612d1

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

api/AltV.Net.Async/Elements/Entities/AsyncBaseObject.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ public class AsyncBaseObject : IBaseObject, IInternalBaseObject
1616
public IntPtr NativePointer => BaseObject.NativePointer;
1717
public IntPtr BaseObjectNativePointer => BaseObject.BaseObjectNativePointer;
1818

19+
public uint Id
20+
{
21+
get
22+
{
23+
lock (BaseObject)
24+
{
25+
return BaseObject.Id;
26+
}
27+
}
28+
}
1929
public ICore Core => BaseObject.Core;
2030
public bool Cached => BaseObject.Cached;
2131
ISharedCore ISharedBaseObject.Core => BaseObject.Core;

api/AltV.Net.Client/Elements/Entities/BaseObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class BaseObject : SharedBaseObject, IBaseObject
1313
public override IntPtr NativePointer => BaseObjectNativePointer;
1414
public override ICore Core { get; }
1515
public override BaseObjectType Type { get; }
16-
public uint Id { get; }
16+
public override uint Id { get; }
1717

1818
public BaseObject(ICore core, IntPtr baseObjectPointer, BaseObjectType type, uint id)
1919
{

api/AltV.Net.Shared/Elements/Entities/ISharedBaseObject.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public interface ISharedBaseObject : INative
99
{
1010
IntPtr BaseObjectNativePointer { get; }
1111
BaseObjectType Type { get; }
12+
uint Id { get; }
1213
ISharedCore Core { get; }
1314
bool Cached { get; }
1415

api/AltV.Net.Shared/Elements/Entities/SharedBaseObject.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace AltV.Net.Shared.Elements.Entities
1212
public abstract class SharedBaseObject : ISharedBaseObject, IInternalBaseObject
1313
{
1414
public abstract IntPtr BaseObjectNativePointer { get; protected set; }
15+
public abstract uint Id { get; }
1516
public abstract ISharedCore Core { get; }
1617
public virtual IntPtr NativePointer => BaseObjectNativePointer;
1718

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public abstract class BaseObject : SharedBaseObject, IBaseObject, IInternalBaseO
2121

2222
public override ICore Core { get; }
2323

24-
public uint Id { get; }
24+
public override uint Id { get; }
2525

2626
public override BaseObjectType Type { get; }
2727

0 commit comments

Comments
 (0)