diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-03 22:25:42 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-03 22:25:42 +0100 |
| commit | a3759c1462fd2fe89a545fc9ece90559b4a2469a (patch) | |
| tree | dc46c925aec3e28fdb610f55245377453e67fa73 /src/Entities/Player.cpp | |
| parent | Fixed #626 (diff) | |
| parent | Merge pull request #623 from mc-server/tnt (diff) | |
| download | cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar.gz cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar.bz2 cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar.lz cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar.xz cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.tar.zst cuberite-a3759c1462fd2fe89a545fc9ece90559b4a2469a.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 a1c942c20..d649cacf2 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -792,11 +792,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; } } |