Sneed-Group/Poodletooth-iLand
3
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

force teleport on shard

Browse source
This commit is contained in:
Zach 2015-03-08 21:15:13 -05:00
parent fd720c4ebd
commit e80e586b55
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
toontown/shtiker/ShardPage.py
View file

@ -389,12 +389,7 @@ class ShardPage(ShtikerPage.ShtikerPage):
place = base.cr.playGame.hood.loader.place place = base.cr.playGame.hood.loader.place
except: except:
place = base.cr.playGame.hood.place place = base.cr.playGame.hood.place
if ZoneUtil.getCanonicalHoodId(self.getCurrentZoneId()) != groupId: place.requestTeleport(groupId, groupId, base.localAvatar.defaultShard, -1)
place.requestTeleport(groupId, groupId, base.localAvatar.defaultShard, -1)
else:
btpl = (self.currentBTP, self.currentBTL, self.currentBTR, self.currentBTI)
args = self.currentO.append(btpl)
self.reloadRightBrain(*args)
def leaveGroup(self, groupId, buttonTuple): def leaveGroup(self, groupId, buttonTuple):
self.acceptOnce('confLeave', self.confirmLeaveGroup, extraArgs=[groupId, buttonTuple]) self.acceptOnce('confLeave', self.confirmLeaveGroup, extraArgs=[groupId, buttonTuple])
@ -422,12 +417,7 @@ class ShardPage(ShtikerPage.ShtikerPage):
hoodId = gids.get(groupId) hoodId = gids.get(groupId)
if hoodId is None: if hoodId is None:
return return
if ZoneUtil.getCanonicalHoodId(self.getCurrentZoneId()) != hoodId: place.requestTeleport(hoodId, hoodId, base.localAvatar.defaultShard, -1)
place.requestTeleport(hoodId, hoodId, base.localAvatar.defaultShard, -1)
else:
btpl = (self.currentBTP, self.currentBTL, self.currentBTR, self.currentBTI)
args = self.currentO.append(btpl)
self.reloadRightBrain(*args)
def getPopColor(self, pop): def getPopColor(self, pop):
if pop <= self.lowPop: if pop <= self.lowPop: