minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-07-05 01:10:22 +02:00
Code Issues Releases Wiki Activity

Fix sound and particlespawner id generation (#14059)

Browse Source 
* Fix server sound ids being reused to early

* Fix particlespawner id generation

It always returned 0.
Also, now the ids always grow, to make a conflict with ids in lua unlikely.
This commit is contained in:
DS
2023-12-01 00:09:53 +01:00
committed by GitHub
parent a7e5456099
commit 6106e4e72b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/serverenvironment.cpp
View File

@ -1638,11 +1638,11 @@ u32 ServerEnvironment::addParticleSpawner(float exptime)
float time = exptime > 0.f ? exptime : PARTICLE_SPAWNER_NO_EXPIRY;
u32 free_id = m_particle_spawners_id_last_used;
while (free_id == 0 || m_particle_spawners.find(free_id) != m_particle_spawners.end()) {
do {
free_id++;
if (free_id == m_particle_spawners_id_last_used)
return 0; // full
free_id++;
}
} while (free_id == 0 || m_particle_spawners.find(free_id) != m_particle_spawners.end());
m_particle_spawners_id_last_used = free_id;
m_particle_spawners[free_id] = time;