Merge branch 'master' of https://gitlab.com/toontown-unlimited/src

toontown/catalog/CatalogGenerator.py

@@ -512,7 +512,7 @@ MonthlySchedule = ((7,
    CatalogGardenItem(104, 1),
    CatalogToonStatueItem(105, endPoseIndex=108),
    #CatalogRentalItem(1, 2880, 1000), # TODO
-   #CatalogGardenStarterItem(), # TODO
+   CatalogGardenStarterItem(), # TODO
    CatalogNametagItem(100),
    CatalogNametagItem(0),
    CatalogClothingItem(1608, 0, 0),

toontown/estate/DistributedHouseDoor.py

@@ -12,6 +12,7 @@ from toontown.hood import ZoneUtil
 from toontown.suit import Suit
 from toontown.building import FADoorCodes
 from toontown.building import DoorTypes
+from toontown.estate.DistributedHouse import DistributedHouse
 
 class DistributedHouseDoor(DistributedDoor.DistributedDoor):
 
@@ -36,6 +37,8 @@ class DistributedHouseDoor(DistributedDoor.DistributedDoor):
         DistributedObject.DistributedObject.announceGenerate(self)
         if self.doorType == DoorTypes.EXT_STANDARD:
             house = base.cr.doId2do.get(self.houseId)
+            if not isinstance(house, DistributedHouse):
+                self.notify.error('tried to use {0} as house'.format(house.__class__.__name__))
             if house and house.house_loaded:
                 self.__gotRelatedHouse()
             else:

toontown/estate/EstateManagerAI.py

@@ -403,4 +403,5 @@ class EstateManagerAI(DistributedObjectAI):
             pass
 
     def _lookupEstate(self, toon):
+        print(self.toon2estate)
         return self.toon2estate.get(toon)