summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2020-04-02 09:29:42 +0200
committerGitHub <noreply@github.com>2020-04-02 09:29:42 +0200
commit59e38d1a46101252e684e9514bdb912e3e030fec (patch)
treef9238350265272e8840f3ccb7bcd9bef6cd30386 /src/Entities
parentOops, that wasn't supposed to be negated (diff)
downloadcuberite-59e38d1a46101252e684e9514bdb912e3e030fec.tar
cuberite-59e38d1a46101252e684e9514bdb912e3e030fec.tar.gz
cuberite-59e38d1a46101252e684e9514bdb912e3e030fec.tar.bz2
cuberite-59e38d1a46101252e684e9514bdb912e3e030fec.tar.lz
cuberite-59e38d1a46101252e684e9514bdb912e3e030fec.tar.xz
cuberite-59e38d1a46101252e684e9514bdb912e3e030fec.tar.zst
cuberite-59e38d1a46101252e684e9514bdb912e3e030fec.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Player.cpp2
-rw-r--r--src/Entities/Player.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 8876566da..b5d7f7c83 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -3080,7 +3080,7 @@ float cPlayer::GetExplosionExposureRate(Vector3d a_ExplosionPosition, float a_Ex
return 0; // No impact from explosion
}
- return super::GetExplosionExposureRate(a_ExplosionPosition, a_ExlosionPower);
+ return super::GetExplosionExposureRate(a_ExplosionPosition, a_ExlosionPower) / 30.0f;
}
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index bea6e98f6..fafdd04eb 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -581,6 +581,9 @@ public:
Otherwise it returns the dig speed (float GetDigSpeed(BLOCKTYPE a_Block)) divided by the block hardness (cBlockInfo::GetHardness(BLOCKTYPE a_Block)) divided by 30 if the player can harvest the block and divided by 100 if he can't. */
float GetPlayerRelativeBlockHardness(BLOCKTYPE a_Block);
+ /** get player explosion exposure rate */
+ virtual float GetExplosionExposureRate(Vector3d a_ExplosionPosition, float a_ExlosionPower) override;
+
protected:
typedef std::vector<std::vector<AString> > AStringVectorVector;
@@ -759,9 +762,6 @@ protected:
/** Returns the filename for the player data based on the UUID given.
This can be used both for online and offline UUIDs. */
AString GetUUIDFileName(const cUUID & a_UUID);
-
- /** get player explosion exposure rate */
- virtual float GetExplosionExposureRate(Vector3d a_ExplosionPosition, float a_ExlosionPower) override;
private:
/** Pins the player to a_Location until Unfreeze() is called.