From d2d5edfe06d8f284dc4a4520943f3d1a625e3f2b Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Sun, 27 Aug 2017 09:24:42 +0300 Subject: Fixed some headers, incorprated some code from the conflicts --- src/Mobs/Cow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Mobs/Cow.h') diff --git a/src/Mobs/Cow.h b/src/Mobs/Cow.h index b12da9030..337d0674d 100644 --- a/src/Mobs/Cow.h +++ b/src/Mobs/Cow.h @@ -30,10 +30,10 @@ private: cBehaviorBreeder m_BehaviorBreeder; cBehaviorItemFollower m_BehaviorItemFollower; cBehaviorCoward m_BehaviorCoward; - cBehaviorItemReplacer m_BehaviorWanderer; + cBehaviorWanderer m_BehaviorWanderer; // Non tick controlling behaviors - cBehaviorWanderer m_BehaviorItemReplacer; + cBehaviorItemReplacer m_BehaviorItemReplacer; } ; -- cgit v1.2.3