From fec64bb91c03c5e872a8f6fbc1a253f341373072 Mon Sep 17 00:00:00 2001 From: Persson-dev <66266021+Persson-dev@users.noreply.github.com> Date: Wed, 29 Dec 2021 20:28:41 +0100 Subject: Improved farmer AI & Fixed entity loading functions (#5351) * Allow villagers to pickup items * Add farmer villager harvesting * Use of auto keyword * Using for loop to check adjacent crops * Show particules when farmer harvest * Fix area comment * Move constants to header file * Removing unnecessary semicolon * Initialization of CropBlockType variable * Apply 12xx12 suggestion * Fixing area constant size * Refactor bounding box calculation, use vectors. * Add Api documentation * Update lua docs * Rework farmer ai * Fixing lua docs notes * Add missing capitalisation * Add villagers inventory save * Fixing loading entities from disk inconsistencies * Add farmer harvest animation * Fix beetroots grow state Co-authored-by: Alexander Harkness --- src/Entities/Pickup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Entities/Pickup.h') diff --git a/src/Entities/Pickup.h b/src/Entities/Pickup.h index 73540a64e..c995055ff 100644 --- a/src/Entities/Pickup.h +++ b/src/Entities/Pickup.h @@ -33,7 +33,7 @@ public: // tolua_export virtual void SpawnOn(cClientHandle & a_ClientHandle) override; - bool CollectedBy(cPlayer & a_Dest); // tolua_export + bool CollectedBy(cEntity & a_Dest); // tolua_export virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; -- cgit v1.2.3