diff --git a/toontown/parties/DistributedPartyCannonActivity.py b/toontown/parties/DistributedPartyCannonActivity.py index 380941a..6ab579c 100644 --- a/toontown/parties/DistributedPartyCannonActivity.py +++ b/toontown/parties/DistributedPartyCannonActivity.py @@ -261,12 +261,7 @@ class DistributedPartyCannonActivity(DistributedPartyActivity): return Task.done if self.isLocalToonId(toonId): self.inWater = 0 - flightResults = self.__calcFlightResults(cannon, toonId, launchTime) - if not __debug__ or __execWarnings__: - print('EXECWARNING DistributedPartyCannonActivity: %s' % flightResults) - printStack() - for key in flightResults: - exec("%s = flightResults['%s']" % (key, key)) + startPos, startHpr, startVel, trajectory = self.__calcFlightResults(cannon, toonId, launchTime) self.notify.debug('start position: ' + str(startPos)) self.notify.debug('start velocity: ' + str(startVel)) @@ -376,10 +371,7 @@ class DistributedPartyCannonActivity(DistributedPartyActivity): quantizeVec(startVel, self.NetDivisor) trajectory = Trajectory.Trajectory(launchTime, startPos, startVel) self.trajectory = trajectory - return {'startPos': startPos, - 'startHpr': startHpr, - 'startVel': startVel, - 'trajectory': trajectory} + return startPos, startHpr, startVel, trajectory def __shootTask(self, task): task.info['cannon'].fire()