summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-07-02 22:59:21 +0200
committerMattes D <github@xoft.cz>2014-07-02 22:59:21 +0200
commit39fff19955e07460b1160ed962829c9e0a51a454 (patch)
treecd2b8aa7e24fb9c9052c55a67ea3364b837a5cf5 /src/Entities/Player.h
parentMerge remote-tracking branch 'origin/master' (diff)
parentSuggestion (diff)
downloadcuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar.gz
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar.bz2
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar.lz
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar.xz
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar.zst
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Player.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 9e443b468..f247ac2f9 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -124,6 +124,9 @@ public:
inline double GetStance(void) const { return GetPosY() + 1.62; } // tolua_export // TODO: Proper stance when crouching etc.
inline cInventory & GetInventory(void) { return m_Inventory; } // tolua_export
inline const cInventory & GetInventory(void) const { return m_Inventory; }
+
+ /** Gets the contents of the player's associated enderchest */
+ cItemGrid & GetEnderChestContents(void) { return m_EnderChestContents; }
inline const cItem & GetEquippedItem(void) const { return GetInventory().GetEquippedItem(); } // tolua_export
@@ -449,7 +452,13 @@ protected:
float m_LastGroundHeight;
bool m_bTouchGround;
double m_Stance;
+
+ /** Stores the player's inventory, consisting of crafting grid, hotbar, and main slots */
cInventory m_Inventory;
+
+ /** An item grid that stores the player specific enderchest contents */
+ cItemGrid m_EnderChestContents;
+
cWindow * m_CurrentWindow;
cWindow * m_InventoryWindow;
@@ -510,8 +519,6 @@ protected:
cStatManager m_Stats;
-
-
/** Sets the speed and sends it to the client, so that they are forced to move so. */
virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) override;