diff options
author | lapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-12-26 21:57:12 +0100 |
---|---|---|
committer | lapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-12-26 21:57:12 +0100 |
commit | 9f77572fb0d045229556314ba9d7aa0f52ad5635 (patch) | |
tree | 67bf3cfaf013be8566e0d541c1a1b571719816f7 /source/cPassiveMonster.cpp | |
parent | - improved ClosestPlayerDetection (Really the closest now ;)) (diff) | |
download | cuberite-9f77572fb0d045229556314ba9d7aa0f52ad5635.tar cuberite-9f77572fb0d045229556314ba9d7aa0f52ad5635.tar.gz cuberite-9f77572fb0d045229556314ba9d7aa0f52ad5635.tar.bz2 cuberite-9f77572fb0d045229556314ba9d7aa0f52ad5635.tar.lz cuberite-9f77572fb0d045229556314ba9d7aa0f52ad5635.tar.xz cuberite-9f77572fb0d045229556314ba9d7aa0f52ad5635.tar.zst cuberite-9f77572fb0d045229556314ba9d7aa0f52ad5635.zip |
Diffstat (limited to 'source/cPassiveMonster.cpp')
-rw-r--r-- | source/cPassiveMonster.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/cPassiveMonster.cpp b/source/cPassiveMonster.cpp index 1f11484ef..0879ebbee 100644 --- a/source/cPassiveMonster.cpp +++ b/source/cPassiveMonster.cpp @@ -14,7 +14,8 @@ cPassiveMonster::~cPassiveMonster() void cPassiveMonster::TakeDamage(int a_Damage, cEntity* a_Instigator)
{
cMonster::TakeDamage(a_Damage, a_Instigator);
- m_EMState = ESCAPING;
+ if(a_Instigator != this)
+ m_EMState = ESCAPING;
}
void cPassiveMonster::Tick(float a_Dt)
|