1 files changed, 9 insertions, 6 deletions
diff --git a/src/npc.cpp b/src/npc.cpp
index fe0b4598..3f9a1601 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -58,13 +58,16 @@ NPC::NPC(Uint32 id, Uint16 job, Map *map, Network *network):
         c++;
     }
 
-    //setup particle effects
-    for (std::list<std::string>::const_iterator i = info.particles.begin();
-         i != info.particles.end();
-         i++)
+    if (mParticleEffects)
     {
-        Particle *p = particleEngine->addEffect(*i, 0, 0);
-        this->controlParticle(p);
+        //setup particle effects
+        for (std::list<std::string>::const_iterator i = info.particles.begin();
+             i != info.particles.end();
+             i++)
+        {
+            Particle *p = particleEngine->addEffect(*i, 0, 0);
+            this->controlParticle(p);
+        }
     }
     mName = 0;
 }