Merge pull request #1231 from markski1/main

CAPI: Fix legacy slots not being released for GZ and Pickups

Author: AmyrAhmady

Server/Components/CAPI/Impl/GangZones/APIs.cpp

@@ -46,8 +46,9 @@ OMP_CAPI(GangZone_Create, objectPtr(float minx, float miny, float maxx, float ma
 OMP_CAPI(GangZone_Destroy, bool(objectPtr gangzone))
 {
 	POOL_ENTITY_RET(gangzones, IGangZone, gangzone, gz, false);
+	int legacyID = gangzones->toLegacyID(gz->getID());
 	gangzones->release(gz->getID());
-	gangzones->releaseLegacyID(gangzones->toLegacyID(gz->getID()));
+	gangzones->releaseLegacyID(legacyID);
 	return true;
 }
 

Server/Components/CAPI/Impl/Pickups/APIs.cpp

@@ -62,8 +62,9 @@ OMP_CAPI(Pickup_AddStatic, bool(int model, int type, float x, float y, float z,
 OMP_CAPI(Pickup_Destroy, bool(objectPtr pickup))
 {
 	POOL_ENTITY_RET(pickups, IPickup, pickup, p, false);
+	int legacyID = pickups->toLegacyID(p->getID());
 	pickups->release(p->getID());
-	pickups->releaseLegacyID(pickups->toLegacyID(p->getID()));
+	pickups->releaseLegacyID(legacyID);
 	return true;
 }