sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

general: fix shard page & news page crash

Browse source
This commit is contained in:
John Cote 2019-12-30 20:27:42 -05:00
parent 5e0d895680
commit f4f9033f63
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
otp/distributed/OTPClientRepository.py
View file

@ -1867,15 +1867,15 @@ class OTPClientRepository(ClientRepositoryBase):
return 0 return 0
def listActiveShards(self): def listActiveShards(self):
list = [] activeShards = []
for s in list(self.activeDistrictMap.values()): for s in list(self.activeDistrictMap.values()):
if s.available: if s.available:
list.append((s.doId, activeShards.append((s.doId,
s.name, s.name,
s.avatarCount, s.avatarCount,
s.newAvatarCount)) s.newAvatarCount))
return list return activeShards
def getPlayerAvatars(self): def getPlayerAvatars(self):
return [ i for i in list(self.doId2do.values()) if isinstance(i, DistributedPlayer) ] return [ i for i in list(self.doId2do.values()) if isinstance(i, DistributedPlayer) ]

2
toontown/shtiker/IssueFrameV2.py
View file

@ -33,7 +33,7 @@ class IssueFrameV2(IssueFrame.IssueFrame):
def isSectionInIndex(self, sectionIdent): def isSectionInIndex(self, sectionIdent):
for name in self.newsIndexEntries: for name in self.newsIndexEntries:
if sectionIdent in name and self.dateStr in name: if sectionIdent.encode('utf-8') in name and self.dateStr.encode('utf-8') in name:
return True return True
return False return False

3
toontown/shtiker/ShardPage.py
View file

@ -9,6 +9,7 @@ from toontown.hood import ZoneUtil
from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownGlobals
from toontown.distributed import ToontownDistrictStats from toontown.distributed import ToontownDistrictStats
from toontown.toontowngui import TTDialog from toontown.toontowngui import TTDialog
import functools
POP_COLORS_NTT = (Vec4(0.0, 1.0, 0.0, 1.0), Vec4(1.0, 1.0, 0.0, 1.0), Vec4(1.0, 0.0, 0.0, 1.0)) POP_COLORS_NTT = (Vec4(0.0, 1.0, 0.0, 1.0), Vec4(1.0, 1.0, 0.0, 1.0), Vec4(1.0, 0.0, 0.0, 1.0))
POP_COLORS = (Vec4(0.4, 0.4, 1.0, 1.0), Vec4(0.4, 1.0, 0.4, 1.0), Vec4(1.0, 0.4, 0.4, 1.0)) POP_COLORS = (Vec4(0.4, 0.4, 1.0, 1.0), Vec4(0.4, 1.0, 0.4, 1.0), Vec4(1.0, 0.4, 0.4, 1.0))
@ -181,7 +182,7 @@ class ShardPage(ShtikerPage.ShtikerPage):
else: else:
return 0 return 0
curShardTuples.sort(compareShardTuples) curShardTuples.sort(key=functools.cmp_to_key(compareShardTuples))
if base.cr.welcomeValleyManager: if base.cr.welcomeValleyManager:
curShardTuples.append((ToontownGlobals.WelcomeValleyToken, curShardTuples.append((ToontownGlobals.WelcomeValleyToken,
TTLocalizer.WelcomeValley[-1], TTLocalizer.WelcomeValley[-1],