diff options
author | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-22 16:03:54 +0200 |
---|---|---|
committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-08-22 19:55:30 +0200 |
commit | 4afd0d4f49460fd8517a8c71bbb6034bc0cd8047 (patch) | |
tree | 9e753e3e12e52c024c8231112932c42460f066b7 /src/Mobs | |
parent | d (diff) | |
download | cuberite-4afd0d4f49460fd8517a8c71bbb6034bc0cd8047.tar cuberite-4afd0d4f49460fd8517a8c71bbb6034bc0cd8047.tar.gz cuberite-4afd0d4f49460fd8517a8c71bbb6034bc0cd8047.tar.bz2 cuberite-4afd0d4f49460fd8517a8c71bbb6034bc0cd8047.tar.lz cuberite-4afd0d4f49460fd8517a8c71bbb6034bc0cd8047.tar.xz cuberite-4afd0d4f49460fd8517a8c71bbb6034bc0cd8047.tar.zst cuberite-4afd0d4f49460fd8517a8c71bbb6034bc0cd8047.zip |
Diffstat (limited to 'src/Mobs')
-rw-r--r-- | src/Mobs/Monster.cpp | 9 | ||||
-rw-r--r-- | src/Mobs/Monster.h | 2 | ||||
-rw-r--r-- | src/Mobs/Wolf.cpp | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index beb743818..d02ea1809 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -1115,6 +1115,15 @@ cPawn * cMonster::GetTarget() +bool cMonster::IsPathFinderActivated() const +{ + return m_PathfinderActivated; +} + + + + + cBehaviorAggressive * cMonster::GetBehaviorAggressive() { return nullptr; diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h index 309037e3e..a9669ced9 100644 --- a/src/Mobs/Monster.h +++ b/src/Mobs/Monster.h @@ -220,7 +220,7 @@ public: /** Returns if this mob last target was a player to avoid destruction on player quit */ bool WasLastTargetAPlayer() const { return m_WasLastTargetAPlayer; } - bool IsPathFinderActivated() const { return m_p + bool IsPathFinderActivated() const; // Behavior getters virtual cBehaviorAggressive * GetBehaviorAggressive(); virtual cBehaviorBreeder * GetBehaviorBreeder(); diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp index 520de483d..cc0ee02a4 100644 --- a/src/Mobs/Wolf.cpp +++ b/src/Mobs/Wolf.cpp @@ -326,7 +326,7 @@ void cWolf::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) MoveToPosition(GetTarget()->GetPosition()); if (TargetIsInRange()) { - Attack(a_Dt); + // Attack(a_Dt); mobTodo } } } |