diff --git a/otp/avatar/LocalAvatar.py b/otp/avatar/LocalAvatar.py index 6b4d393d..819e0cc3 100755 --- a/otp/avatar/LocalAvatar.py +++ b/otp/avatar/LocalAvatar.py @@ -1098,18 +1098,18 @@ class LocalAvatar(DistributedAvatar.DistributedAvatar, DistributedSmoothNode.Dis def __friendOnline(self, doId): friend = base.cr.identifyFriend(doId) - if friend != None: + if friend: self.setSystemMessage(doId, OTPLocalizer.WhisperFriendComingOnline % friend.getName()) def __friendOffline(self, doId): friend = base.cr.identifyFriend(doId) - if friend != None: + if friend: self.setSystemMessage(0, OTPLocalizer.WhisperFriendLoggedOut % friend.getName()) def clickedWhisper(self, doId): friend = base.cr.identifyFriend(doId) - if friend != None: + if friend: messenger.send('clickedNametag', [friend]) self.chatMgr.whisperTo(friend.getName(), doId) diff --git a/toontown/friends/TTSFriendsManagerUD.py b/toontown/friends/TTSFriendsManagerUD.py index bd78350c..1133cc90 100755 --- a/toontown/friends/TTSFriendsManagerUD.py +++ b/toontown/friends/TTSFriendsManagerUD.py @@ -239,7 +239,6 @@ class TTSFriendsManagerUD(DistributedObjectGlobalUD): friendId = friend[0] if friendId in self.onlineToons: self.sendUpdateToAvatarId(doId, 'friendOnline', [friendId]) - self.sendUpdateToAvatarId(friendId, 'friendOnline', [doId]) def goingOffline(self, avId): self.toonOffline(avId)