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

coghq: fix another ceo crash

Browse source
This commit is contained in:
John Cote 2020-01-14 01:47:12 -05:00
parent c393377ae4
commit d1f72e47ef
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/coghq/DistributedBanquetTable.py
View file

@ -297,6 +297,8 @@ class DistributedBanquetTable(DistributedObject.DistributedObject, FSM.FSM, Banq
serviceLoc = self.serviceLocs[chairIndex] serviceLoc = self.serviceLocs[chairIndex]
def foodAttach(self = self, diner = diner): def foodAttach(self = self, diner = diner):
if not self.serviceLocs[chairIndex].getNumChildren():
return
foodModel = self.serviceLocs[chairIndex].getChild(0) foodModel = self.serviceLocs[chairIndex].getChild(0)
(foodModel.reparentTo(diner.getRightHand()),) (foodModel.reparentTo(diner.getRightHand()),)
(foodModel.setHpr(Point3(0, -94, 0)),) (foodModel.setHpr(Point3(0, -94, 0)),)

2
toontown/suit/DistributedBossbotBoss.py
View file

@ -195,7 +195,7 @@ class DistributedBossbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
npc.setPickable(0) npc.setPickable(0)
npc.setPlayerType(NametagGroup.CCNonPlayer) npc.setPlayerType(NametagGroup.CCNonPlayer)
dna = ToonDNA.ToonDNA() dna = ToonDNA.ToonDNA()
dna.newToonRandom(11237, 'm', 1) dna.newToonRandom(146392, 'm', 1)
dna.head = 'sls' dna.head = 'sls'
npc.setDNAString(dna.makeNetString()) npc.setDNAString(dna.makeNetString())
npc.animFSM.request('neutral') npc.animFSM.request('neutral')