diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-07 18:07:14 +0100 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-19 06:05:22 +0100 |
| commit | 83459d0d899786378e8304c92a5b79ddca92c62f (patch) | |
| tree | 637e5302c5c5affc5f3c52d4c195cba5607aac30 /src/Mobs/Monster.cpp | |
| parent | Merge pull request #3020 from cuberite/ice_block (diff) | |
| download | cuberite-83459d0d899786378e8304c92a5b79ddca92c62f.tar cuberite-83459d0d899786378e8304c92a5b79ddca92c62f.tar.gz cuberite-83459d0d899786378e8304c92a5b79ddca92c62f.tar.bz2 cuberite-83459d0d899786378e8304c92a5b79ddca92c62f.tar.lz cuberite-83459d0d899786378e8304c92a5b79ddca92c62f.tar.xz cuberite-83459d0d899786378e8304c92a5b79ddca92c62f.tar.zst cuberite-83459d0d899786378e8304c92a5b79ddca92c62f.zip | |
Diffstat (limited to 'src/Mobs/Monster.cpp')
| -rw-r--r-- | src/Mobs/Monster.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 28cb10238..fad54a00d 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -256,7 +256,7 @@ void cMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) } if ((GetTarget() != nullptr)) { - ASSERT(!GetTarget()->IsDestroyed()); + ASSERT(GetTarget()->IsTicking()); if (GetTarget()->IsPlayer()) { @@ -912,7 +912,7 @@ int cMonster::GetSpawnDelay(cMonster::eFamily a_MobFamily) /** Sets the target. */ void cMonster::SetTarget (cPawn * a_NewTarget) { - ASSERT((a_NewTarget == nullptr) || (!IsDestroyed())); + ASSERT((a_NewTarget == nullptr) || (IsTicking())); if (m_Target == a_NewTarget) { return; @@ -928,7 +928,7 @@ void cMonster::SetTarget (cPawn * a_NewTarget) if (a_NewTarget != nullptr) { - ASSERT(!a_NewTarget->IsDestroyed()); + ASSERT(a_NewTarget->IsTicking()); // Notify the new target that we are now targeting it. m_Target->TargetingMe(this); } |