diff options
| author | Lukas Pioch <lukas@zgow.de> | 2015-12-17 11:37:20 +0100 |
|---|---|---|
| committer | Lukas Pioch <lukas@zgow.de> | 2015-12-17 11:37:20 +0100 |
| commit | 1395ff3ca4baf554f8b47a73ebd7bbf7635f59cb (patch) | |
| tree | d589a1e5fb4813e100fd377bae9378c37a619370 /src/Entities/Entity.cpp | |
| parent | Merge pull request #2753 from cuberite/pathFix (diff) | |
| parent | Moved variables into scope, removed unused variables and fixed variables (diff) | |
| download | cuberite-1395ff3ca4baf554f8b47a73ebd7bbf7635f59cb.tar cuberite-1395ff3ca4baf554f8b47a73ebd7bbf7635f59cb.tar.gz cuberite-1395ff3ca4baf554f8b47a73ebd7bbf7635f59cb.tar.bz2 cuberite-1395ff3ca4baf554f8b47a73ebd7bbf7635f59cb.tar.lz cuberite-1395ff3ca4baf554f8b47a73ebd7bbf7635f59cb.tar.xz cuberite-1395ff3ca4baf554f8b47a73ebd7bbf7635f59cb.tar.zst cuberite-1395ff3ca4baf554f8b47a73ebd7bbf7635f59cb.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 4c84df1f4..9f2d39de4 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -513,7 +513,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI) RemovedDamage += CeilC(EPFProtection * 0.04 * a_TDI.FinalDamage); } - if ((a_TDI.DamageType == dtFalling) || (a_TDI.DamageType == dtFall) || (a_TDI.DamageType == dtEnderPearl)) + if ((a_TDI.DamageType == dtFalling) || (a_TDI.DamageType == dtEnderPearl)) { RemovedDamage += CeilC(EPFFeatherFalling * 0.04 * a_TDI.FinalDamage); } |