Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-24 04:02:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Potential street teleport fix"

Browse source 
This reverts commit e0ea00b3bd.
This commit is contained in:
Loudrob 2015-03-29 11:55:35 -04:00
parent 325c705ae0
commit c79f5498e1
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
otp/distributed/OTPClientRepository.py
View file

@ -1899,10 +1899,12 @@ class OTPClientRepository(ClientRepositoryBase):
pass pass
def identifyAvatar(self, doId): def identifyAvatar(self, doId):
if self.doId2do.has_key(doId): info = self.doId2do.get(doId)
return self.doId2do[doId] if info:
return info
else: else:
return self.identifyFriend(doId) info = self.identifyFriend(doId)
return info
def sendDisconnect(self): def sendDisconnect(self):
if self.isConnected(): if self.isConnected():

2
otp/friends/PlayerFriendsManager.py
View file

@ -251,7 +251,7 @@ class PlayerFriendsManager(DistributedObjectGlobal):
return returnList return returnList
def identifyAvatar(self, doId): def identifyAvatar(self, doId):
if base.cr.doId2do.has_key(doId) if doId in base.cr.doId2do:
return base.cr.doId2do[doId] return base.cr.doId2do[doId]
else: else:
return self.identifyFriend(doId) return self.identifyFriend(doId)

6
toontown/distributed/ToontownClientRepository.py
View file

@ -679,11 +679,11 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
self.friendsMap[avatar.doId] = avatar self.friendsMap[avatar.doId] = avatar
def identifyFriend(self, doId, source = None): def identifyFriend(self, doId, source = None):
if self.friendsMap.has_key(doId): if doId in self.friendsMap:
teleportNotify.debug('friend %s in friendsMap' % doId) teleportNotify.debug('friend %s in friendsMap' % doId)
return self.friendsMap[doId] return self.friendsMap[doId]
avatar = None avatar = None
if self.doId2do.has_key(doId): if doId in self.doId2do:
teleportNotify.debug('found friend %s in doId2do' % doId) teleportNotify.debug('found friend %s in doId2do' % doId)
avatar = self.doId2do[doId] avatar = self.doId2do[doId]
elif self.cache.contains(doId): elif self.cache.contains(doId):
@ -716,7 +716,7 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
return base.cr.playerFriendsManager.getFriendInfo(pId) return base.cr.playerFriendsManager.getFriendInfo(pId)
def identifyAvatar(self, doId): def identifyAvatar(self, doId):
if self.doId2do.has_key(doId): if doId in self.doId2do:
return self.doId2do[doId] return self.doId2do[doId]
else: else:
return self.identifyFriend(doId) return self.identifyFriend(doId)