From e80e586b55b3f1bec0b98b9ecd32961b586602b0 Mon Sep 17 00:00:00 2001 From: Zach Date: Sun, 8 Mar 2015 21:15:13 -0500 Subject: [PATCH] force teleport on shard --- toontown/shtiker/ShardPage.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/toontown/shtiker/ShardPage.py b/toontown/shtiker/ShardPage.py index 747e06a5..bbf2c878 100644 --- a/toontown/shtiker/ShardPage.py +++ b/toontown/shtiker/ShardPage.py @@ -389,12 +389,7 @@ class ShardPage(ShtikerPage.ShtikerPage): place = base.cr.playGame.hood.loader.place except: place = base.cr.playGame.hood.place - if ZoneUtil.getCanonicalHoodId(self.getCurrentZoneId()) != groupId: - 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) + place.requestTeleport(groupId, groupId, base.localAvatar.defaultShard, -1) def leaveGroup(self, groupId, buttonTuple): self.acceptOnce('confLeave', self.confirmLeaveGroup, extraArgs=[groupId, buttonTuple]) @@ -422,12 +417,7 @@ class ShardPage(ShtikerPage.ShtikerPage): hoodId = gids.get(groupId) if hoodId is None: return - if ZoneUtil.getCanonicalHoodId(self.getCurrentZoneId()) != hoodId: - 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) + place.requestTeleport(hoodId, hoodId, base.localAvatar.defaultShard, -1) def getPopColor(self, pop): if pop <= self.lowPop: