summaryrefslogtreecommitdiffstats
path: root/src/Mobs/Behaviors/BehaviorAttackerMelee.cpp
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2017-08-30 14:16:53 +0200
committerLogicParrot <LogicParrot@users.noreply.github.com>2017-08-30 14:16:53 +0200
commitd712e754c6d2ff28540ff454a86ce41c6e1f5253 (patch)
treec17cbc929c1a113740638e1eae7b3c3270267af9 /src/Mobs/Behaviors/BehaviorAttackerMelee.cpp
parentBehaviorAttacker (diff)
downloadcuberite-d712e754c6d2ff28540ff454a86ce41c6e1f5253.tar
cuberite-d712e754c6d2ff28540ff454a86ce41c6e1f5253.tar.gz
cuberite-d712e754c6d2ff28540ff454a86ce41c6e1f5253.tar.bz2
cuberite-d712e754c6d2ff28540ff454a86ce41c6e1f5253.tar.lz
cuberite-d712e754c6d2ff28540ff454a86ce41c6e1f5253.tar.xz
cuberite-d712e754c6d2ff28540ff454a86ce41c6e1f5253.tar.zst
cuberite-d712e754c6d2ff28540ff454a86ce41c6e1f5253.zip
Diffstat (limited to 'src/Mobs/Behaviors/BehaviorAttackerMelee.cpp')
-rw-r--r--src/Mobs/Behaviors/BehaviorAttackerMelee.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Mobs/Behaviors/BehaviorAttackerMelee.cpp b/src/Mobs/Behaviors/BehaviorAttackerMelee.cpp
index 42e88c637..337d8d216 100644
--- a/src/Mobs/Behaviors/BehaviorAttackerMelee.cpp
+++ b/src/Mobs/Behaviors/BehaviorAttackerMelee.cpp
@@ -3,9 +3,11 @@
#include "BehaviorAttackerMelee.h"
#include "../Monster.h"
#include "../../Entities/Pawn.h"
+#include "../../BlockID.h"
-bool cBehaviorAttackerMelee::StrikeTarget(std::chrono::milliseconds a_Dt, cChunk & a_Chunk, int a_StrikeTickCnt)
+bool cBehaviorAttackerMelee::StrikeTarget(int a_StrikeTickCnt)
{
- GetTarget()->TakeDamage(dtMobAttack, this, m_AttackDamage, 0);
- return true;
+ UNUSED(a_StrikeTickCnt);
+ GetTarget()->TakeDamage(dtMobAttack, m_Parent, m_AttackDamage, 0);
+ return true; // Finish the strike. It only takes 1 tick.
}