Hacked in serverside effects

src/Engine/Core/EntityWrapper.cpp

@@ -99,6 +99,10 @@ EntityWrapper::operator bool()
 
 EntityWrapper EntityWrapper::firstChildByNameRecursive(const std::string& name, EntityID parent)
 {
+    if (!this->World->ValidEntity(parent)) {
+        return EntityWrapper::Invalid;
+    }
+
     auto itPair = this->World->GetChildren(parent);
     if (itPair.first == itPair.second) {
         return EntityWrapper::Invalid;

src/Engine/Network/Server.cpp

@@ -269,6 +269,7 @@ void Server::parseOnInputCommand(Packet& packet)
             Events::InputCommand e;
             e.Command = packet.ReadString();
             e.PlayerID = player; // Set correct player id
+            e.Player = EntityWrapper(m_World, m_ConnectedPlayers.at(player).EntityID);
             e.Value = packet.ReadPrimitive<float>();
             m_EventBroker->Publish(e);
             //LOG_INFO("Server::parseOnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);

src/Game/Systems/WeaponSystem.cpp

@@ -25,14 +25,13 @@ bool WeaponSystem::OnPlayerSpawned(const Events::PlayerSpawned& e)
 
 bool WeaponSystem::OnInputCommand(const Events::InputCommand& e)
 {
-    // Only shoot if the player is alive
-    if (!m_LocalPlayer.Valid()) {
-        return false;
-    }
-
     if (e.Command == "PrimaryFire" && e.Value > 0) {
         Events::Shoot eShoot;
-        eShoot.Player = m_LocalPlayer;
+        if (e.PlayerID == -1) {
+            eShoot.Player = m_LocalPlayer;
+        } else {
+            eShoot.Player = e.Player;
+        }
         m_EventBroker->Publish(eShoot);
     }
 
@@ -41,6 +40,10 @@ bool WeaponSystem::OnInputCommand(const Events::InputCommand& e)
 
 bool WeaponSystem::OnShoot(Events::Shoot& eShoot) 
 {
+    if (!eShoot.Player.Valid()) {
+        return false;
+    }
+
     // TODO: Weapon firing effects here
 
     auto rayRed = ResourceManager::Load<EntityFile>("Schema/Entities/RayRed.xml");