oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Fix attached sounds stopping if objects are removed serverside (#14436)

Browse source 
Restores backwards compatibility for death sounds or other sounds that are not supposed to be "cut off" abruptly.

---------

Co-authored-by: sfan5 <sfan5@live.de>
Co-authored-by: grorp <gregor.parzefall@posteo.de>
This commit is contained in:
Lars Müller 2024-03-06 20:36:02 +01:00 • committed by GitHub
parent fc80f65a6d
commit bf52d1e624
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 63 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/server.cpp
View file

@ -2041,7 +2041,8 @@ void Server::SendActiveObjectRemoveAdd(RemoteClient *client, PlayerSAO *playersa
if (my_radius <= 0)
my_radius = radius;
std::queue<u16> removed_objects, added_objects;
std::queue<std::pair<bool, u16>> removed_objects;
std::queue<u16> added_objects;
m_env->getRemovedActiveObjects(playersao, my_radius, player_radius,
client->m_known_objects, removed_objects);
m_env->getAddedActiveObjects(playersao, my_radius, player_radius,
@ -2057,13 +2058,21 @@ void Server::SendActiveObjectRemoveAdd(RemoteClient *client, PlayerSAO *playersa
std::string data;
// Handle removed objects
writeU16((u8*)buf, removed_objects.size());
data.append(buf, 2);
while (!removed_objects.empty()) {
// Get object
u16 id = removed_objects.front();
const auto [gone, id] = removed_objects.front();
ServerActiveObject* obj = m_env->getActiveObject(id);
// Stop sounds if objects go out of range.
// This fixes https://github.com/minetest/minetest/issues/8094.
// We may not remove sounds if an entity was removed on the server.
// See https://github.com/minetest/minetest/issues/14422.
if (!gone) // just out of range for client, not gone on server?
stopAttachedSounds(client->peer_id, id);
// Add to data buffer for sending
writeU16((u8*)buf, id);
data.append(buf, 2);
@ -2278,19 +2287,30 @@ void Server::fadeSound(s32 handle, float step, float gain)
m_playing_sounds.erase(it);
}
void Server::stopAttachedSounds(u16 id)
void Server::stopAttachedSounds(session_t peer_id, u16 object_id)
{
assert(id);
assert(peer_id != PEER_ID_INEXISTENT);
assert(object_id);
for (auto it = m_playing_sounds.begin(); it != m_playing_sounds.end(); ) {
const ServerPlayingSound &sound = it->second;
for (auto it = m_playing_sounds.begin(); it != m_playing_sounds.end();) {
ServerPlayingSound &sound = it->second;
if (sound.object == id) {
// Remove sound reference
if (sound.object != object_id)
continue;
auto clients_it = sound.clients.find(peer_id);
if (clients_it == sound.clients.end())
continue;
NetworkPacket pkt(TOCLIENT_STOP_SOUND, 4);
pkt << it->first;
Send(peer_id, &pkt);
sound.clients.erase(clients_it);
if (sound.clients.empty())
it = m_playing_sounds.erase(it);
}
else
it++;
++it;
}
}