diff options
author | bibo38 <bibo38@github.com> | 2015-10-31 16:24:45 +0100 |
---|---|---|
committer | bibo38 <bibo38@github.com> | 2015-10-31 23:06:10 +0100 |
commit | 73b8be0fef6603b5dd3a101c26a4947669068d5e (patch) | |
tree | 671987e9a48544fd0fc37135732feebdca697caa /src/Entities/Pawn.cpp | |
parent | Merge pull request #2549 from cuberite/TouchGround (diff) | |
download | cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.gz cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.bz2 cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.lz cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.xz cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.zst cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.zip |
Diffstat (limited to 'src/Entities/Pawn.cpp')
-rw-r--r-- | src/Entities/Pawn.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp index 2cd0f2f0e..9045f8595 100644 --- a/src/Entities/Pawn.cpp +++ b/src/Entities/Pawn.cpp @@ -61,6 +61,15 @@ void cPawn::KilledBy(TakeDamageInfo & a_TDI) +bool cPawn::IsFireproof(void) const +{ + return super::IsFireproof() || HasEntityEffect(cEntityEffect::effFireResistance); +} + + + + + void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, short a_Intensity, double a_DistanceModifier) { // Check if the plugins allow the addition: @@ -98,6 +107,15 @@ void cPawn::RemoveEntityEffect(cEntityEffect::eType a_EffectType) +bool cPawn::HasEntityEffect(cEntityEffect::eType a_EffectType) const +{ + return m_EntityEffects.find(a_EffectType) != m_EntityEffects.end(); +} + + + + + void cPawn::ClearEntityEffects() { // Iterate through this entity's applied effects |