diff options
| author | Mattes D <github@xoft.cz> | 2013-09-11 21:19:39 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2013-09-11 21:19:39 +0200 |
| commit | 85804d085deaa311a91dc272b0715c0f18771207 (patch) | |
| tree | 74bff08b3a69a18d6832a7bb3d5660281f600f3e /source/Entities/Player.cpp | |
| parent | Merge pull request #161 from worktycho/master (diff) | |
| parent | More changes [SEE DESC] (diff) | |
| download | cuberite-85804d085deaa311a91dc272b0715c0f18771207.tar cuberite-85804d085deaa311a91dc272b0715c0f18771207.tar.gz cuberite-85804d085deaa311a91dc272b0715c0f18771207.tar.bz2 cuberite-85804d085deaa311a91dc272b0715c0f18771207.tar.lz cuberite-85804d085deaa311a91dc272b0715c0f18771207.tar.xz cuberite-85804d085deaa311a91dc272b0715c0f18771207.tar.zst cuberite-85804d085deaa311a91dc272b0715c0f18771207.zip | |
Diffstat (limited to 'source/Entities/Player.cpp')
| -rw-r--r-- | source/Entities/Player.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp index 22f1b8967..751920759 100644 --- a/source/Entities/Player.cpp +++ b/source/Entities/Player.cpp @@ -610,10 +610,13 @@ void cPlayer::SetSprint(bool a_IsSprinting) void cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI) { - if (m_GameMode == eGameMode_Creative) + if (a_TDI.DamageType != dtInVoid) { - // No damage / health in creative mode - return; + if (IsGameModeCreative()) + { + // No damage / health in creative mode + return; + } } super::DoTakeDamage(a_TDI); |