From 071b7be3d4d08c337c01de7abca034e6c3746194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dami=C3=A1n=20Imrich?= Date: Sat, 3 Apr 2021 19:45:20 +0200 Subject: Basic elytra flight (#5124) * Basic elytra flight Co-authored-by: 12xx12 <44411062+12xx12@users.noreply.github.com> Co-authored-by: Tiger Wang --- src/Entities/Minecart.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/Entities/Minecart.h') diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h index a98014799..0d62d98f1 100644 --- a/src/Entities/Minecart.h +++ b/src/Entities/Minecart.h @@ -105,10 +105,10 @@ public: CLASS_PROTODEF(cRideableMinecart) - cRideableMinecart(Vector3d a_Pos, const cItem & a_Content, int a_Height); + cRideableMinecart(Vector3d a_Pos, const cItem & a_Content, int a_ContentHeight); - const cItem & GetContent(void) const {return m_Content;} - int GetBlockHeight(void) const {return m_Height;} + const cItem & GetContent(void) const { return m_Content; } + int GetBlockHeight(void) const { return m_ContentHeight; } // cEntity overrides: virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = nullptr) override; @@ -116,9 +116,8 @@ public: protected: - cItem m_Content; - int m_Height; + int m_ContentHeight; } ; -- cgit v1.2.3