From 1238ca66f3f67ee6969c663c80c64cdbc156b0f5 Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Thu, 7 Aug 2014 02:53:24 +0200
Subject: more threading / offlineplayer fixes

---
 friends.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'friends.py')

diff --git a/friends.py b/friends.py
index 6522406..686fed8 100644
--- a/friends.py
+++ b/friends.py
@@ -25,22 +25,23 @@ def friendmessage(player, message): # sends a message with a prefix
 
 
 def ls(sender):
-  sender_friends = friends.get(uid(sender), False)
-  if sender_friends:
-    friends_string = ""
-    for uuid in sender_friends:
-      friends_string += (retrieve_player(uuid).getName() + ", ")
-    friendmessage(sender, "&aYour friends list: " + friends_string[:len(friends_string)-2])
-  else:
-    friendmessage(sender, "&cYour friends list is empty")
+  try:
+    sender_friends = friends.get(uid(sender), False)
+    if sender_friends:
+      friends_string = ""
+      for uuid in sender_friends:
+        friends_string += (retrieve_player(uuid).getName() + ", ")
+      friendmessage(sender, "&aYour friends list: " + friends_string[:len(friends_string)-2])
+    else:
+      friendmessage(sender, "&cYour friends list is empty")
+  except:
+    warn("Unable to finish friends' ls process")
 
 
 def clear(sender):
   sender_id = uid(sender)
 
   if friends.get(sender_id, False):
-    for uuid in friends[sender_id]:
-      friendmessage(retrieve_player(uuid), "&c&o%s &cremoved you from their friends list" % stripcolors(sender.getDisplayName()))
     friends.pop(sender_id)
     friendmessage(sender, "&aFriends list cleared")
     save_friends()
@@ -133,7 +134,7 @@ def on_friend_command(sender, args):
 
   # /friends list
   if cmd in ["list", "lst", "*"]:
-    ls(sender)
+    thread.start_new_thread(ls, (sender,))
 
   # /friends clear
   elif cmd in ["clear", "/"]:
-- 
cgit v1.2.3