summaryrefslogtreecommitdiff
path: root/src/content_sao.cpp
diff options
context:
space:
mode:
authorraymoo <uguu@installgentoo.com>2016-08-04 13:09:21 -0700
committerNer'zhul <nerzhul@users.noreply.github.com>2016-10-13 17:33:16 +0200
commitc9e7a27eeb628be78a835abadf8afe1177eb90c5 (patch)
tree119a8747a0d33f69f5e14c6a563f3e9df673f923 /src/content_sao.cpp
parent0b27a70b294590d7fb2bb25bf2d207a719ce8d98 (diff)
downloadminetest-c9e7a27eeb628be78a835abadf8afe1177eb90c5.tar.gz
minetest-c9e7a27eeb628be78a835abadf8afe1177eb90c5.tar.bz2
minetest-c9e7a27eeb628be78a835abadf8afe1177eb90c5.zip
Attached particle spawners
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r--src/content_sao.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 5d3ed38bc..375a43c90 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -156,6 +156,11 @@ LuaEntitySAO::~LuaEntitySAO()
if(m_registered){
m_env->getScriptIface()->luaentity_Remove(m_id);
}
+
+ for (UNORDERED_SET<u32>::iterator it = m_attached_particle_spawners.begin();
+ it != m_attached_particle_spawners.end(); ++it) {
+ m_env->deleteParticleSpawner(*it, false);
+ }
}
void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
@@ -817,7 +822,6 @@ PlayerSAO::~PlayerSAO()
{
if(m_inventory != &m_player->inventory)
delete m_inventory;
-
}
std::string PlayerSAO::getDescription()
@@ -844,6 +848,10 @@ void PlayerSAO::removingFromEnvironment()
m_player->peer_id = 0;
m_env->savePlayer(m_player);
m_env->removePlayer(m_player);
+ for (UNORDERED_SET<u32>::iterator it = m_attached_particle_spawners.begin();
+ it != m_attached_particle_spawners.end(); ++it) {
+ m_env->deleteParticleSpawner(*it, false);
+ }
}
}