summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-09-29 14:43:16 +0200
committerHowaner <franzi.moos@googlemail.com>2014-09-29 14:43:16 +0200
commitff3a3b801d5fa6edb855b13b73af497b29e8a42e (patch)
treeeb68808a88b206015e90392fe3002e9d2e8c063a
parentMerge branch 'master' into Ranks (diff)
downloadcuberite-ff3a3b801d5fa6edb855b13b73af497b29e8a42e.tar
cuberite-ff3a3b801d5fa6edb855b13b73af497b29e8a42e.tar.gz
cuberite-ff3a3b801d5fa6edb855b13b73af497b29e8a42e.tar.bz2
cuberite-ff3a3b801d5fa6edb855b13b73af497b29e8a42e.tar.lz
cuberite-ff3a3b801d5fa6edb855b13b73af497b29e8a42e.tar.xz
cuberite-ff3a3b801d5fa6edb855b13b73af497b29e8a42e.tar.zst
cuberite-ff3a3b801d5fa6edb855b13b73af497b29e8a42e.zip
-rw-r--r--src/Bindings/ManualBindings_RankManager.cpp10
-rw-r--r--src/RankManager.cpp2
-rw-r--r--src/RankManager.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/Bindings/ManualBindings_RankManager.cpp b/src/Bindings/ManualBindings_RankManager.cpp
index 6e623af0d..3c58a0a92 100644
--- a/src/Bindings/ManualBindings_RankManager.cpp
+++ b/src/Bindings/ManualBindings_RankManager.cpp
@@ -204,11 +204,11 @@ static int tolua_cRankManager_GetAllPermissions(lua_State * L)
-/** Binds cRankManager::GetAllPlayers */
-static int tolua_cRankManager_GetAllPlayers(lua_State * L)
+/** Binds cRankManager::GetAllPlayerUUIDs */
+static int tolua_cRankManager_GetAllPlayerUUIDs(lua_State * L)
{
// Function signature:
- // cRankManager:GetAllPlayers() -> arraytable of Player UUID's
+ // cRankManager:GetAllPlayerUUIDs() -> arraytable of Player UUID's
cLuaState S(L);
if (
@@ -220,7 +220,7 @@ static int tolua_cRankManager_GetAllPlayers(lua_State * L)
}
// Get the player uuid's:
- AStringVector Players = cRoot::Get()->GetRankManager().GetAllPlayers();
+ AStringVector Players = cRoot::Get()->GetRankManager().GetAllPlayerUUIDs();
// Push the results:
S.Push(Players);
@@ -1055,7 +1055,7 @@ void ManualBindings::BindRankManager(lua_State * tolua_S)
tolua_function(tolua_S, "ClearPlayerRanks", tolua_cRankManager_ClearPlayerRanks);
tolua_function(tolua_S, "GetAllGroups", tolua_cRankManager_GetAllGroups);
tolua_function(tolua_S, "GetAllPermissions", tolua_cRankManager_GetAllPermissions);
- tolua_function(tolua_S, "GetAllPlayers", tolua_cRankManager_GetAllPlayers);
+ tolua_function(tolua_S, "GetAllPlayerUUIDs", tolua_cRankManager_GetAllPlayerUUIDs);
tolua_function(tolua_S, "GetAllRanks", tolua_cRankManager_GetAllRanks);
tolua_function(tolua_S, "GetDefaultRank", tolua_cRankManager_GetDefaultRank);
tolua_function(tolua_S, "GetGroupPermissions", tolua_cRankManager_GetGroupPermissions);
diff --git a/src/RankManager.cpp b/src/RankManager.cpp
index fd5e58025..c9b428e3b 100644
--- a/src/RankManager.cpp
+++ b/src/RankManager.cpp
@@ -663,7 +663,7 @@ AStringVector cRankManager::GetRankPermissions(const AString & a_RankName)
-AStringVector cRankManager::GetAllPlayers(void)
+AStringVector cRankManager::GetAllPlayerUUIDs(void)
{
ASSERT(m_IsInitialized);
cCSLock Lock(m_CS);
diff --git a/src/RankManager.h b/src/RankManager.h
index acfcdb01d..3f5884f2e 100644
--- a/src/RankManager.h
+++ b/src/RankManager.h
@@ -84,7 +84,7 @@ public:
AStringVector GetRankPermissions(const AString & a_RankName);
/** Returns the short uuids of all defined players. */
- AStringVector GetAllPlayers(void);
+ AStringVector GetAllPlayerUUIDs(void);
/** Returns the names of all defined ranks. */
AStringVector GetAllRanks(void);