summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-07-31 12:15:18 +0200
committerHowaner <franzi.moos@googlemail.com>2014-07-31 12:15:18 +0200
commitc49d4fd215170da29b5c285cc6a344ec102764c6 (patch)
treee2f6e76ffe5a920108112b7c5b92215e8ccbffd2 /src/BlockEntities
parentRenamed functions and added beacon json saving. (diff)
downloadcuberite-c49d4fd215170da29b5c285cc6a344ec102764c6.tar
cuberite-c49d4fd215170da29b5c285cc6a344ec102764c6.tar.gz
cuberite-c49d4fd215170da29b5c285cc6a344ec102764c6.tar.bz2
cuberite-c49d4fd215170da29b5c285cc6a344ec102764c6.tar.lz
cuberite-c49d4fd215170da29b5c285cc6a344ec102764c6.tar.xz
cuberite-c49d4fd215170da29b5c285cc6a344ec102764c6.tar.zst
cuberite-c49d4fd215170da29b5c285cc6a344ec102764c6.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/BeaconEntity.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/BlockEntities/BeaconEntity.h b/src/BlockEntities/BeaconEntity.h
index 5cf8da24e..cc8ee8ad2 100644
--- a/src/BlockEntities/BeaconEntity.h
+++ b/src/BlockEntities/BeaconEntity.h
@@ -55,10 +55,10 @@ public:
cEntityEffect::eType GetPrimaryEffect(void) const { return m_PrimaryEffect; }
cEntityEffect::eType GetSecondaryEffect(void) const { return m_SecondaryEffect; }
- /** Select the primary potion. Returns false when the potion is invalid.*/
+ /** Select the primary effect. Returns false when the effect is invalid.*/
bool SelectPrimaryEffect(cEntityEffect::eType a_Effect);
- /** Select the secondary potion. Returns false when the potion is invalid. */
+ /** Select the secondary effect. Returns false when the effect is invalid. */
bool SelectSecondaryEffect(cEntityEffect::eType a_Effect);
/** Calculate the amount of layers the pyramid below the beacon has. */
@@ -76,7 +76,7 @@ public:
/** Returns true if the block is a diamond block, a golden block, an iron block or an emerald block. */
static bool IsMineralBlock(BLOCKTYPE a_BlockType);
- /** Returns true if the potion can be used. */
+ /** Returns true if the effect can be used. */
static bool IsValidEffect(cEntityEffect::eType a_Effect, char a_BeaconLevel);
// tolua_end