diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-12-04 14:43:01 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-12-04 14:43:01 +0200 |
| commit | 4cc117ddf6149b5b488e598a620674c8df208eac (patch) | |
| tree | 32881a0ac8394cf7bdea5ab8dc26195c711a6ed9 /src/materials.cpp | |
| parent | ceaf8edaded4c9e8f2e6fa285d9765e7095df332 (diff) | |
| download | minetest-4cc117ddf6149b5b488e598a620674c8df208eac.tar.gz minetest-4cc117ddf6149b5b488e598a620674c8df208eac.tar.bz2 minetest-4cc117ddf6149b5b488e598a620674c8df208eac.zip | |
Properly use time_from_last_punch for limiting PvP punch damage
Diffstat (limited to 'src/materials.cpp')
| -rw-r--r-- | src/materials.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/materials.cpp b/src/materials.cpp index 3f88f9d45..d2d37ebf4 100644 --- a/src/materials.cpp +++ b/src/materials.cpp @@ -104,9 +104,9 @@ HittingProperties getHittingProperties(const MaterialProperties *mp, time_from_last_punch); // If digging time would be 1 second, 2 hearts go in 1 second. - s16 hp = 2.0 * 2.0 / digprop.time + 0.5; + s16 hp = 2.0 * 2.0 / digprop.time; // Wear is the same as for digging a single node - s16 wear = (float)digprop.wear + 0.5; + s16 wear = (float)digprop.wear; return HittingProperties(hp, wear); } |