fixup! Merge remote-tracking branch 'origin/master' into WeaponSystem

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

@@ -323,6 +323,7 @@ bool AssaultWeaponBehaviour::shoot(double damage)
 
     // Deal damage! 
     Events::PlayerDamage ePlayerDamage;
+    ePlayerDamage.Inflictor = m_Player;
     ePlayerDamage.Victim = victim;
     ePlayerDamage.Damage = damage;
     m_EventBroker->Publish(ePlayerDamage);

src/Game/Systems/Weapon/WeaponSystem.cpp

@@ -93,6 +93,4 @@ bool WeaponSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
     // Select primary weapon on player spawn
     // TODO: Select the active one specified by player component
     return true;
-}
-
-    ePlayerDamage.PlayerShooter = eShoot.Player;
+}