Merge branch 'master' into Respawning

# Conflicts: # resources/DefaultConfig.ini # resources/Schema/Entities/MovementTest.xml # src/Game/Systems/SoundSystem.cpp
2016-02-12 00:29:51 +01:00
parent dd131e7652 04f77da6f1
commit 11af6a3078
62 changed files with 7752 additions and 858 deletions
@@ -59,8 +59,10 @@ void PlayerDeathSystem::createDeathEffect(EntityWrapper player)
    //deathEffectEW["ExplosionEffect"]["ExplosionOrigin"] = glm::vec3(0, 0, 0);

    //camera (with lifetime) behind the player
-    auto cam = deathEffectEW.FirstChildByName("Camera");
-    Events::SetCamera eSetCamera;
-    eSetCamera.CameraEntity = cam;
-    m_EventBroker->Publish(eSetCamera);
+    if (player == LocalPlayer) {
+        auto cam = deathEffectEW.FirstChildByName("Camera");
+        Events::SetCamera eSetCamera;
+        eSetCamera.CameraEntity = cam;
+        m_EventBroker->Publish(eSetCamera);
+    }
 }