From f9dfc0a7668568b0baf52c3160d295541d0ea618 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Sat, 29 Mar 2014 18:36:31 -0400 Subject: [PATCH] Fixed #313 --- scripts/commands/sitserver.py | 1 - src/services/EntertainmentService.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/commands/sitserver.py b/scripts/commands/sitserver.py index a8167409..9e732988 100644 --- a/scripts/commands/sitserver.py +++ b/scripts/commands/sitserver.py @@ -22,7 +22,6 @@ def run(core, actor, target, commandString): actor.setPosture(8) actor.setStateBitmask(32768) actor.setTurnRadius(0) - actor.setChairCellId(cellId) return # sit w/o chair actor.setPosture(8) diff --git a/src/services/EntertainmentService.java b/src/services/EntertainmentService.java index 56a83aa0..8b64175e 100644 --- a/src/services/EntertainmentService.java +++ b/src/services/EntertainmentService.java @@ -749,7 +749,7 @@ public class EntertainmentService implements INetworkDispatch { scheduler.schedule(() -> { performer.setFlourishCount(0); - performer.setPerformingFlourish(true); + performer.setPerformingFlourish(false); }, (long) performance.getLoopDuration(), TimeUnit.SECONDS); }