diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-02 13:47:17 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-02 13:47:17 +0100 |
| commit | b89419f603126b9c8e01c607912b2976ba66ffda (patch) | |
| tree | 20df68bbf68a91fdb3171470ae45160b4330cbbe /src/Entities/Player.cpp | |
| parent | Again improved LogReplaceLine (diff) | |
| download | cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar.gz cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar.bz2 cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar.lz cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar.xz cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar.zst cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.zip | |
Diffstat (limited to 'src/Entities/Player.cpp')
| -rw-r--r-- | src/Entities/Player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 82e31ae65..ca0f0e770 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -784,11 +784,11 @@ void cPlayer::SetFlying(bool a_IsFlying) void cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI) { - if (a_TDI.DamageType != dtInVoid) + if ((a_TDI.DamageType != dtInVoid) && (a_TDI.DamageType != dtPlugin)) { if (IsGameModeCreative()) { - // No damage / health in creative mode if not void damage + // No damage / health in creative mode if not void or plugin damage return; } } |