From 61e761fdc2bfa5c77002d68bb24e0470def37b48 Mon Sep 17 00:00:00 2001
From: Vincent <vincent.leung60@gmail.com>
Date: Sat, 29 Nov 2014 00:36:15 -0800
Subject: issue 1253 - prevent multiple logins with same username

---
 src/World.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/World.cpp')

diff --git a/src/World.cpp b/src/World.cpp
index 0dec0bd96..9ae9e41d9 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -3666,3 +3666,15 @@ void cWorld::cChunkGeneratorCallbacks::CallHookChunkGenerated (cChunkDesc & a_Ch
 
 
 
+
+std::list<std::string> cWorld::GetUsernames()
+{
+	std::list<std::string> usernames;
+	cCSLock Lock(m_CSPlayers);
+	for (cPlayerList::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+	{
+		std::string username = (*itr)->GetName();
+		usernames.insert(usernames.begin(),username);
+	}
+	return usernames;
+}
-- 
cgit v1.2.3


From a7bf2725c8bd5f8ec3e03584af87a7055cb15a60 Mon Sep 17 00:00:00 2001
From: Vincent <vincent.leung60@gmail.com>
Date: Sat, 29 Nov 2014 11:22:03 -0800
Subject: fixed naming of strings and changed from i to I

---
 src/World.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/World.cpp')

diff --git a/src/World.cpp b/src/World.cpp
index 9ae9e41d9..e6a2f161a 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -3667,14 +3667,18 @@ void cWorld::cChunkGeneratorCallbacks::CallHookChunkGenerated (cChunkDesc & a_Ch
 
 
 
-std::list<std::string> cWorld::GetUsernames()
+std::list<AString> cWorld::GetUsernames()
 {
-	std::list<std::string> usernames;
+	std::list<AString> usernames;
 	cCSLock Lock(m_CSPlayers);
 	for (cPlayerList::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
 	{
-		std::string username = (*itr)->GetName();
+		AString username = (*itr)->GetName();
 		usernames.insert(usernames.begin(),username);
 	}
 	return usernames;
 }
+
+
+
+
-- 
cgit v1.2.3


From 20dcceb7e6a8810525fd873f29e665759bdde087 Mon Sep 17 00:00:00 2001
From: Vincent <vincent.leung60@gmail.com>
Date: Sat, 29 Nov 2014 15:46:31 -0800
Subject: removed GetUsernames() from World

---
 src/World.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'src/World.cpp')

diff --git a/src/World.cpp b/src/World.cpp
index e6a2f161a..100df5742 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -3667,18 +3667,3 @@ void cWorld::cChunkGeneratorCallbacks::CallHookChunkGenerated (cChunkDesc & a_Ch
 
 
 
-std::list<AString> cWorld::GetUsernames()
-{
-	std::list<AString> usernames;
-	cCSLock Lock(m_CSPlayers);
-	for (cPlayerList::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
-	{
-		AString username = (*itr)->GetName();
-		usernames.insert(usernames.begin(),username);
-	}
-	return usernames;
-}
-
-
-
-
-- 
cgit v1.2.3