Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-12-11 09:11:50 +00:00
Code Issues Projects Releases Wiki Activity

Avoid null uid in EntityManager#registerEntity

Browse Source 
Apply suggestion by @chunkybanana to improve readability.
This commit is contained in:
Даниїл Григор'єв 2025-05-03 03:04:39 +03:00
parent 69fb06e817
commit e041369a7d
No known key found for this signature in database
GPG Key ID: B890DF16341D8C1D
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/game/entity_manager.ts
View File

@ -56,7 +56,7 @@ export class EntityManager extends BasicSerializableObject {
* Registers a new entity * Registers a new entity
* @param uid Optional predefined uid * @param uid Optional predefined uid
*/ */
registerEntity(entity: Entity, uid: number | null = null) { registerEntity(entity: Entity, uid = this.generateUid()) {
if (G_IS_DEV && !globalConfig.debug.disableSlowAsserts) { if (G_IS_DEV && !globalConfig.debug.disableSlowAsserts) {
assert( assert(
this.entities.get(entity.uid) !== entity, this.entities.get(entity.uid) !== entity,
@ -65,13 +65,13 @@ export class EntityManager extends BasicSerializableObject {
} }
assert(!entity.destroyed, `Attempting to register destroyed entity ${entity}`); assert(!entity.destroyed, `Attempting to register destroyed entity ${entity}`);
if (G_IS_DEV && !globalConfig.debug.disableSlowAsserts && uid !== null) { if (G_IS_DEV && !globalConfig.debug.disableSlowAsserts) {
assert(!this.findByUid(uid, false), "Entity uid already taken: " + uid); assert(!this.findByUid(uid, false), "Entity uid already taken: " + uid);
assert(uid >= 0 && uid < Number.MAX_SAFE_INTEGER, "Invalid uid passed: " + uid); assert(uid >= 0 && uid < Number.MAX_SAFE_INTEGER, "Invalid uid passed: " + uid);
} }
// Give each entity a unique id // Give each entity a unique id
entity.uid = uid ? uid : this.generateUid(); entity.uid = uid;
entity.registered = true; entity.registered = true;
this.entities.set(entity.uid, entity); this.entities.set(entity.uid, entity);