summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.h
diff options
context:
space:
mode:
authorandrew <xdotftw@gmail.com>2014-01-19 13:20:57 +0100
committerandrew <xdotftw@gmail.com>2014-01-19 13:20:57 +0100
commit2b943610598c193a349107fd9345d321724aff98 (patch)
treecdbd322700f037143ef9e11e7e4515c1d29df94d /src/Entities/Player.h
parentMerge pull request #559 from mc-server/SpawnMobParticles (diff)
downloadcuberite-2b943610598c193a349107fd9345d321724aff98.tar
cuberite-2b943610598c193a349107fd9345d321724aff98.tar.gz
cuberite-2b943610598c193a349107fd9345d321724aff98.tar.bz2
cuberite-2b943610598c193a349107fd9345d321724aff98.tar.lz
cuberite-2b943610598c193a349107fd9345d321724aff98.tar.xz
cuberite-2b943610598c193a349107fd9345d321724aff98.tar.zst
cuberite-2b943610598c193a349107fd9345d321724aff98.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Player.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index bf3ca08e8..52e629dc3 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -13,6 +13,7 @@
class cGroup;
class cWindow;
class cClientHandle;
+class cTeam;
@@ -153,6 +154,12 @@ public:
AString GetIP(void) const { return m_IP; } // tolua_export
+ /// Returns the associated team, NULL if none
+ cTeam* GetTeam(void) { return m_Team; } // tolua_export
+
+ /// Sets the player team, NULL if none
+ void SetTeam(cTeam* a_Team);
+
// tolua_end
void SetIP(const AString & a_IP);
@@ -456,6 +463,8 @@ protected:
int m_FloaterID;
+ cTeam* m_Team;
+
void ResolvePermissions(void);
@@ -463,7 +472,7 @@ protected:
virtual void Destroyed(void);
- /// Filters out damage for creative mode
+ /// Filters out damage for creative mode/friendly fire
virtual void DoTakeDamage(TakeDamageInfo & TDI) override;
/// Called in each tick to handle food-related processing