From caee40df5da03eb2db6ed8d528f1561ef9bcbd34 Mon Sep 17 00:00:00 2001 From: Fate Date: Tue, 9 Dec 2008 08:37:38 -0700 Subject: Status particle effects: when looking up block IDs (effect IDs for other players), make sure to initialise if needed Status particle effects: properly delete particles after effect has worn off --- src/particlecontainer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/particlecontainer.cpp') diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp index ddd99ff2..bf15f1b5 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -130,7 +130,8 @@ void ParticleVector::setLocally(int index, Particle *particle) if (mIndexedElements.size() <= (unsigned) index) mIndexedElements.resize(index + 1, NULL); - particle->disableAutoDelete(); + if (particle) + particle->disableAutoDelete(); mIndexedElements[index] = particle; } -- cgit v1.2.3-60-g2f50