3 files changed, 23 insertions, 9 deletions

diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index b1d302560..038173c99 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -2163,7 +2163,7 @@ static int tolua_cMojangAPI_GetUUIDsFromPlayerNames(lua_State * L)
 	if (
 		!S.CheckParamUserTable(1, "cMojangAPI") ||
 		!S.CheckParamTable(2) ||
-		!S.CheckParamEnd(3)
+		!S.CheckParamEnd(4)
 	)
 	{
 		return 0;
@@ -2177,19 +2177,27 @@ static int tolua_cMojangAPI_GetUUIDsFromPlayerNames(lua_State * L)
 	{
 		lua_rawgeti(L, 2, i);
 		AString Name;
-		S.GetStackValue(3, Name);
+		S.GetStackValue(-1, Name);
 		if (!Name.empty())
 		{
 			PlayerNames.push_back(Name);
 		}
 		lua_pop(L, 1);
 	}
+	
+	// If the UseOnlyCached param was given, read it; default to false
+	bool ShouldUseCacheOnly = false;
+	if (lua_gettop(L) == 3)
+	{
+		ShouldUseCacheOnly = (lua_toboolean(L, 3) != 0);
+		lua_pop(L, 1);
+	}
 
 	// Push the output table onto the stack:
-	lua_newtable(L);  // stack index 3
+	lua_newtable(L);
 	
 	// Get the UUIDs:
-	AStringVector UUIDs = cRoot::Get()->GetMojangAPI().GetUUIDsFromPlayerNames(PlayerNames);
+	AStringVector UUIDs = cRoot::Get()->GetMojangAPI().GetUUIDsFromPlayerNames(PlayerNames, ShouldUseCacheOnly);
 	if (UUIDs.size() != PlayerNames.size())
 	{
 		// A hard error has occured while processing the request, no UUIDs were returned. Return an empty table:
@@ -2197,7 +2205,8 @@ static int tolua_cMojangAPI_GetUUIDsFromPlayerNames(lua_State * L)
 	}
 	
 	// Convert to output table, PlayerName -> UUID:
-	for (int i = 0; i < NumNames; i++)
+	size_t len = UUIDs.size();
+	for (size_t i = 0; i < len; i++)
 	{
 		if (UUIDs[i].empty())
 		{
diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp
index 5fbc5b476..71a5e53de 100644
--- a/src/Protocol/MojangAPI.cpp
+++ b/src/Protocol/MojangAPI.cpp
@@ -129,7 +129,7 @@ void cMojangAPI::Start(cIniFile & a_SettingsIni)
 
 
 
-AStringVector cMojangAPI::GetUUIDsFromPlayerNames(const AStringVector & a_PlayerNames)
+AStringVector cMojangAPI::GetUUIDsFromPlayerNames(const AStringVector & a_PlayerNames, bool a_UseOnlyCached)
 {
 	// Convert all playernames to lowercase:
 	AStringVector PlayerNames;
@@ -140,7 +140,10 @@ AStringVector cMojangAPI::GetUUIDsFromPlayerNames(const AStringVector & a_Player
 	}  // for itr - a_PlayerNames[]
 	
 	// Request the cache to populate any names not yet contained:
-	CacheNamesToUUIDs(PlayerNames);
+	if (!a_UseOnlyCached)
+	{
+		CacheNamesToUUIDs(PlayerNames);
+	}
 	
 	// Retrieve from cache:
 	size_t idx = 0;
diff --git a/src/Protocol/MojangAPI.h b/src/Protocol/MojangAPI.h
index c99f940ad..ac8995bb5 100644
--- a/src/Protocol/MojangAPI.h
+++ b/src/Protocol/MojangAPI.h
@@ -50,8 +50,10 @@ public:
 	/** Converts the player names into UUIDs.
 	a_PlayerName[idx] will be converted to UUID and returned as idx-th value
 	The UUID will be empty on error.
-	Blocking operation, do not use in world-tick thread! */
-	AStringVector GetUUIDsFromPlayerNames(const AStringVector & a_PlayerName);
+	If a_UseOnlyCached is true, only the cached values are returned.
+	If a_UseOnlyCached is false, the names not found in the cache are looked up online, which is a blocking
+	operation, do not use this in world-tick thread! */
+	AStringVector GetUUIDsFromPlayerNames(const AStringVector & a_PlayerName, bool a_UseOnlyCached = false);
 	
 	// tolua_begin