Fix player entity aiming at and blip attached

Author: FabianTerhorst

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

@@ -36,7 +36,7 @@ public override short Dimension
                 AltNative.ColShape.ColShape_SetDimension(NativePointer, value);
             }
         }
-        
+
         public override void GetMetaData(string key, ref MValue value) =>
             AltNative.ColShape.ColShape_SetMetaData(NativePointer, key, ref value);
 
@@ -59,10 +59,7 @@ public ColShape(IntPtr nativePointer) : base(nativePointer, BaseObjectType.Check
         public bool IsEntityIn(IEntity entity)
         {
             CheckIfEntityExists();
-            if (!entity.Exists)
-            {
-                throw new EntityRemovedException(entity);
-            }
+            entity.CheckIfEntityExists();
 
             return AltNative.ColShape.ColShape_IsEntityIn(NativePointer, entity.NativePointer);
         }

runtime/src/altv-c-api/blip.cpp

@@ -39,9 +39,20 @@ bool Blip_IsAttached(alt::IBlip* blip) {
     return blip->IsAttached();
 }
 
-alt::IEntity* Blip_AttachedTo(alt::IBlip* blip, alt::IBaseObject::Type &type) {
-    type = blip->AttachedTo()->GetType();
-    return blip->AttachedTo();
+void* Blip_AttachedTo(alt::IBlip* blip, alt::IBaseObject::Type &type) {
+    auto entity = blip->AttachedTo();
+    if (entity != nullptr) {
+        type = entity->GetType();
+        switch (type) {
+            case alt::IBaseObject::Type::PLAYER:
+                return dynamic_cast<alt::IPlayer*>(entity);
+            case alt::IBaseObject::Type::VEHICLE:
+                return dynamic_cast<alt::IVehicle*>(entity);
+            default:
+                return nullptr;
+        }
+    }
+    return nullptr;
 }
 
 uint8_t Blip_GetType(alt::IBlip* blip) {

runtime/src/altv-c-api/blip.h

@@ -29,7 +29,7 @@ EXPORT void Blip_SetMetaData(alt::IBlip* blip, const char* key, alt::MValue* val
 // Blip
 EXPORT bool Blip_IsGlobal(alt::IBlip* blip);
 EXPORT bool Blip_IsAttached(alt::IBlip* blip);
-EXPORT alt::IEntity* Blip_AttachedTo(alt::IBlip* blip, alt::IBaseObject::Type &type);
+EXPORT void* Blip_AttachedTo(alt::IBlip* blip, alt::IBaseObject::Type &type);
 EXPORT uint8_t Blip_GetType(alt::IBlip* blip);
 EXPORT void Blip_SetSprite(alt::IBlip* blip, uint16_t sprite);
 EXPORT void Blip_SetColor(alt::IBlip* blip, uint8_t color);

runtime/src/altv-c-api/player.cpp

@@ -249,7 +249,7 @@ uint8_t Player_GetSeat(alt::IPlayer* player) {
     return player->GetSeat();
 }
 
-alt::IEntity* Player_GetEntityAimingAt(alt::IPlayer* player, alt::IBaseObject::Type &type) {
+void* Player_GetEntityAimingAt(alt::IPlayer* player, alt::IBaseObject::Type &type) {
     auto entity = player->GetEntityAimingAt();
     if (entity != nullptr) {
         type = entity->GetType();

runtime/src/altv-c-api/player.h

@@ -119,7 +119,7 @@ EXPORT bool Player_IsInVehicle(alt::IPlayer* player);
 EXPORT alt::IVehicle* Player_GetVehicle(alt::IPlayer* player);
 EXPORT uint8_t Player_GetSeat(alt::IPlayer* player);
 
-EXPORT alt::IEntity* Player_GetEntityAimingAt(alt::IPlayer* player, alt::IBaseObject::Type &type);
+EXPORT void* Player_GetEntityAimingAt(alt::IPlayer* player, alt::IBaseObject::Type &type);
 EXPORT void Player_GetEntityAimOffset(alt::IPlayer* player, position_t &position);
 
 EXPORT bool Player_IsFlashlightActive(alt::IPlayer* player);