Some network fixes with sidearm
This commit is contained in:
@@ -14,6 +14,7 @@ bool MultiplayerSnapshotFilter::FilterComponent(EntityWrapper entity, SharedComp
|
|||||||
|| component.Info.Name == "Physics"
|
|| component.Info.Name == "Physics"
|
||||||
|| component.Info.Name == "AssaultWeapon"
|
|| component.Info.Name == "AssaultWeapon"
|
||||||
|| component.Info.Name == "DefenderWeapon"
|
|| component.Info.Name == "DefenderWeapon"
|
||||||
|
|| component.Info.Name == "SidearmWeapon"
|
||||||
|| component.Info.Name == "Animation"
|
|| component.Info.Name == "Animation"
|
||||||
|| component.Info.Name == "Blend"
|
|| component.Info.Name == "Blend"
|
||||||
|| component.Info.Name == "BlendAdditive"
|
|| component.Info.Name == "BlendAdditive"
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ BoostSystem::BoostSystem(SystemParams params)
|
|||||||
|
|
||||||
bool BoostSystem::OnPlayerDamage(Events::PlayerDamage& e)
|
bool BoostSystem::OnPlayerDamage(Events::PlayerDamage& e)
|
||||||
{
|
{
|
||||||
|
if (!IsClient) {
|
||||||
|
|
||||||
if (e.Victim.ID == e.Inflictor.ID) {
|
if (e.Victim.ID == e.Inflictor.ID) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -35,8 +37,6 @@ bool BoostSystem::OnPlayerDamage(Events::PlayerDamage& e)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
LOG_INFO("intflictor: %s, vicitm: %s", e.Inflictor.Name().c_str(), e.Victim.Name().c_str());
|
|
||||||
if (className == "SidearmWeapon") { // give ammo
|
if (className == "SidearmWeapon") { // give ammo
|
||||||
giveAmmo(e.Inflictor, e.Victim);
|
giveAmmo(e.Inflictor, e.Victim);
|
||||||
} else { //give boost
|
} else { //give boost
|
||||||
@@ -54,6 +54,7 @@ bool BoostSystem::OnPlayerDamage(Events::PlayerDamage& e)
|
|||||||
m_World->SetName(boostAssaultEntity.ID, className);
|
m_World->SetName(boostAssaultEntity.ID, className);
|
||||||
m_World->SetParent(boostAssaultEntity.ID, e.Victim.ID);
|
m_World->SetParent(boostAssaultEntity.ID, e.Victim.ID);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user