diff options
| author | Mattes D <github@xoft.cz> | 2014-02-03 07:02:25 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-02-03 07:02:25 +0100 |
| commit | b090547c17e919509a85c5810ba7795062987dae (patch) | |
| tree | 4f73807d49f697e087b98ffb46ba1453345129a0 /src/Entities/Player.cpp | |
| parent | Fixed multiple invalid permission nodes (diff) | |
| parent | Added IsBlockWaterOrIce() (diff) | |
| download | cuberite-b090547c17e919509a85c5810ba7795062987dae.tar cuberite-b090547c17e919509a85c5810ba7795062987dae.tar.gz cuberite-b090547c17e919509a85c5810ba7795062987dae.tar.bz2 cuberite-b090547c17e919509a85c5810ba7795062987dae.tar.lz cuberite-b090547c17e919509a85c5810ba7795062987dae.tar.xz cuberite-b090547c17e919509a85c5810ba7795062987dae.tar.zst cuberite-b090547c17e919509a85c5810ba7795062987dae.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 8c37fdc8d..bde623f1b 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -786,11 +786,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; } } |