Fix Vehicle ID Increment

src/core/server/document/character.ts

@@ -12,7 +12,9 @@ const DEBUG_MODE = false; // Use this to see what state is being set.
 
 /**
  * Binds a player identifier to a Character document.
+ *
  * This document is cleared on disconnected automatically.
+ *
  * This should be the first thing you do after having a user authenticate and select a character.
  *
  * @param {alt.Player} player
@@ -105,8 +107,22 @@ export function getField<T = {}, ReturnType = any>(
 
 /**
  * Sets a player document value, and saves it automatically to the selected character's database.
+ *
  * Automatically calls all callbacks associated with the field name.
  *
+ * @example
+ * ```ts
+ * await Athena.document.character.set(somePlayer, 'cash', 50);
+ *
+ * // Alternatively
+ *
+ * interface CustomCharacter {
+ * someKey: string;
+ * }
+ *
+ * await Athena.document.character.set<CustomCharacter>(somePlayer, 'someKey', 'hello world');
+ * ```
+ *
  * @template T
  * @param {alt.Player} player
  * @param {(keyof KnownKeys<Character & T>)} fieldName

src/core/server/getters/vehicle.ts

@@ -11,6 +11,40 @@ import * as players from './players';
 export function byID(id: number): alt.Vehicle | undefined {
  return alt.Vehicle.all.find((x) => x.id === id);
 }
+
+/**
+ * Return a spawned vehicle by is incremental data id.
+ *
+ * This only works for persistent vehicles.
+ *
+ * @export
+ * @param {(number | string)} id
+ * @return {(alt.Vehicle | undefined)}
+ */
+export function byIncrementalDatabaseID(id: number | string): alt.Vehicle | undefined {
+ if (typeof id === 'string') {
+ id = parseInt(id);
+ }
+
+ if (isNaN(id)) {
+ return undefined;
+ }
+
+ return alt.Vehicle.all.find((x) => {
+ const data = Athena.document.vehicle.get(x);
+
+ if (typeof data === 'undefined') {
+ return false;
+ }
+
+ if (data.id !== id) {
+ return false;
+ }
+
+ return true;
+ });
+}
+
 /**
  * Get a vehicle based on their database _id
  * May return undefined if the vehicle is not currently spawned.

src/core/server/systems/global.ts

@@ -91,7 +91,7 @@ export async function increase(key: string, increaseByValue = 1, startValue = 0)
  await isReady();
 
  const document = await Database.fetchData<IGlobal>('_id', uid, CollectionName);
- if (!document[key]) {
+ if (typeof document[key] === 'undefined') {
  document[key] = startValue;
  } else {
  if (typeof document[key] !== 'number') {

src/core/server/vehicle/add.ts

@@ -81,6 +81,7 @@ export async function toPlayer(
 
  await Athena.systems.global.increase('vehicleId');
  const id = await Athena.systems.global.getKey<number>('vehicleId');
+
  const ownedVehicle: OwnedVehicle = {
  dimension: 0,
  keys: options && options.keys ? options.keys : [],
@@ -146,6 +147,7 @@ export async function toDatabase(
 
  await Athena.systems.global.increase('vehicleId');
  const id = await Athena.systems.global.getKey<number>('vehicleId');
+
  const ownedVehicle: OwnedVehicle = {
  dimension: 0,
  keys: options && options.keys ? options.keys : [],