Server can inflict impact damage on clients, character oxygen level syncing bugfix, hulls send a networkevent when oxygen level changes by >=5%, limb velocities aren't reset when receiving a network update

This commit is contained in:
Regalis
2016-06-29 17:26:26 +03:00
parent 3e3ec5a2ef
commit 34c6569313
6 changed files with 48 additions and 35 deletions
@@ -815,7 +815,7 @@ namespace Barotrauma
// - moving sideways
// - reached the top or bottom of the ladder
if (notClimbing ||
(TargetMovement.Y < 0.0f && ConvertUnits.ToSimUnits(trigger.Height) + handPos.Y < HeadPosition * 1.5f) ||
(TargetMovement.Y < 0.0f && ConvertUnits.ToSimUnits(trigger.Height) + handPos.Y < HeadPosition) ||
(TargetMovement.Y > 0.0f && handPos.Y > 0.1f))
{
Anim = Animation.None;
@@ -407,7 +407,7 @@ namespace Barotrauma
if (impact > l.impactTolerance)
{
if (!character.IsNetworkPlayer)
if (!character.IsNetworkPlayer || GameMain.Server != null)
{
character.AddDamage(CauseOfDeath.Damage, impact - l.impactTolerance * 0.1f, null);