BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into FriendlyHost/Join

Browse Source 
# Conflicts:
#	src/Engine/Network/Client.cpp
This commit is contained in:
stiffly
2016-02-22 10:19:48 +01:00
parent a1e932d261 bac23f6e8c
commit c7d31cac2d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Network/Client.cpp
+1 -1
View File
@@ -488,7 +488,7 @@ void Client::parsePlayerDamage(Packet& packet)
Events::PlayerDamage e; Events::PlayerDamage e;
PlayerID victimID = packet.ReadPrimitive<EntityID>(); PlayerID victimID = packet.ReadPrimitive<EntityID>();
PlayerID inflictorID = packet.ReadPrimitive<EntityID>(); PlayerID inflictorID = packet.ReadPrimitive<EntityID>();
if (!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)) { if(!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)){
return; return;
} }
e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(victimID)); e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(victimID));
src/Game/Systems/HealthSystem.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cHea
bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e) bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
{ {
if (!IsServer && m_NetworkEnabled) { if (!IsServer && m_NetworkEnabled || !e.Victim.Valid()) {
return false; return false;
} }