From 8e34a96b7ebeaed5136f38985ba8f68ecaa4950b Mon Sep 17 00:00:00 2001
From: John Cote <jwcotejr@gmail.com>
Date: Sun, 17 Nov 2019 18:51:35 -0500
Subject: [PATCH] general: last of the cleanup for now

---
 otp/distributed/OTPClientRepository.py | 47 +++++++++++++-------------
 toontown/shtiker/IssueFrame.py         |  1 +
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/otp/distributed/OTPClientRepository.py b/otp/distributed/OTPClientRepository.py
index 3a8ad27..5639b62 100644
--- a/otp/distributed/OTPClientRepository.py
+++ b/otp/distributed/OTPClientRepository.py
@@ -1039,6 +1039,30 @@ class OTPClientRepository(ClientRepositoryBase):
             self.loginFSM.request('shutdown')
         return
 
+    if config.GetBool('astron-support', True):
+        @report(types=['args', 'deltaStamp'], dConfigParam='teleport')
+        def handleAvatarListResponse(self, avatarList):
+            avList = []
+            for avNum, avName, avDNA, avPosition, nameState in avatarList:
+                avNames = ['',
+                 '',
+                 '',
+                 '']
+                avNames[0] = avName
+                if nameState == 2:  # Pending
+                    avNames[1] = avName
+                elif nameState == 3:  # Approved
+                    avNames[2] = avName
+                elif nameState == 4:  # Rejected
+                    avNames[3] = avName
+
+                aname = int(nameState == 1)
+                potAv = PotentialAvatar(avNum, avNames, avDNA, avPosition, aname)
+                avList.append(potAv)
+
+            self.avList = avList
+            self.loginFSM.request('chooseAvatar', [self.avList])
+
     @report(types=['args', 'deltaStamp'], dConfigParam='teleport')
     def enterChooseAvatar(self, avList):
         pass
@@ -2448,29 +2472,6 @@ class OTPClientRepository(ClientRepositoryBase):
             distObj = self.generateWithRequiredOtherFields(dclass, doId, di, parentId, zoneId)
             dclass.stopGenerate()
 
-        @report(types=['args', 'deltaStamp'], dConfigParam='teleport')
-        def handleAvatarListResponse(self, avatarList):
-            avList = []
-            for avNum, avName, avDNA, avPosition, nameState in avatarList:
-                avNames = ['',
-                 '',
-                 '',
-                 '']
-                avNames[0] = avName
-                if nameState == 2:  # Pending
-                    avNames[1] = avName
-                elif nameState == 3:  # Approved
-                    avNames[2] = avName
-                elif nameState == 4:  # Rejected
-                    avNames[3] = avName
-
-                aname = int(nameState == 1)
-                potAv = PotentialAvatar(avNum, avNames, avDNA, avPosition, aname)
-                avList.append(potAv)
-
-            self.avList = avList
-            self.loginFSM.request('chooseAvatar', [self.avList])
-
     def handleDisable(self, di, ownerView = False):
         doId = di.getUint32()
         if not self.isLocalId(doId):
diff --git a/toontown/shtiker/IssueFrame.py b/toontown/shtiker/IssueFrame.py
index e21a878..8687761 100644
--- a/toontown/shtiker/IssueFrame.py
+++ b/toontown/shtiker/IssueFrame.py
@@ -35,6 +35,7 @@ class IssueFrame(DirectFrame):
         DirectFrame.__init__(self, frameColor=(1, 1, 1, 0), frameSize=self.FrameDimensions, relief=DGG.FLAT, parent=parent)
         self.hide()
         self.accept('newsSnapshot', self.doSnapshot)
+        self._parent = parent
         self.newsDir = newsDir
         self.dateStr = dateStr
         self.myIssueIndex = myIssueIndex