get rid of offlineplayer in friends

This commit is contained in:
jomo
2014-08-07 02:24:45 +02:00
parent 939e744a33
commit 7c2c87a05e

View File

@@ -58,8 +58,8 @@ def add(sender, names):
friends[sender_id] = [] friends[sender_id] = []
for name in names: for name in names:
player = server.getOfflinePlayer(name) player = server.getPlayer(name)
if known_player(player): if player:
player_id = uid(player) player_id = uid(player)
not_yourself = player != sender not_yourself = player != sender
@@ -78,7 +78,7 @@ def add(sender, names):
if added: if added:
friendmessage(sender, "&a&o%s&a added." % ", ".join(added)) friendmessage(sender, "&a&o%s&a added." % ", ".join(added))
if notfound: if notfound:
friendmessage(sender, "&c&o%s&c not found." % ", ".join(notfound)) friendmessage(sender, "&c&o%s&c not found. (must be online)" % ", ".join(notfound))
if friendalready: if friendalready:
friendmessage(sender, "&c&o%s&c is/are already your friend." % ", ".join(friendalready)) friendmessage(sender, "&c&o%s&c is/are already your friend." % ", ".join(friendalready))
if not not_yourself: if not not_yourself:
@@ -92,8 +92,8 @@ def rem(sender, names):
notafriend = [] notafriend = []
for name in names: for name in names:
player = server.getOfflinePlayer(name) player = server.Player(name)
if known_player(player): if player:
player_id = uid(player) player_id = uid(player)
if player_id in friends.get(sender_id, []): if player_id in friends.get(sender_id, []):
friends[sender_id].remove(player_id) friends[sender_id].remove(player_id)
@@ -108,7 +108,7 @@ def rem(sender, names):
if removed: if removed:
friendmessage(sender, "&a&o%s&a removed." % ", ".join(removed)) friendmessage(sender, "&a&o%s&a removed." % ", ".join(removed))
if notfound: if notfound:
friendmessage(sender, "&c&o%s&c not found." % ", ".join(notfound)) friendmessage(sender, "&c&o%s&c not found. (must be online)" % ", ".join(notfound))
if notafriend: if notafriend:
friendmessage(sender, "&c&o%s&c is/are not in your friends list." % ", ".join(notafriend)) friendmessage(sender, "&c&o%s&c is/are not in your friends list." % ", ".join(notafriend))