From d63de683aa76bfaf2e17dab08dd59c2df6a77b23 Mon Sep 17 00:00:00 2001 From: Obique Date: Sun, 23 Dec 2018 02:09:15 -0600 Subject: [PATCH] Fixed flourishes for non-entertainers --- .../gameplay/entertainment/EntertainmentService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/entertainment/EntertainmentService.java b/src/main/java/com/projectswg/holocore/services/gameplay/entertainment/EntertainmentService.java index 6cc3f662b..13e6bcc9b 100644 --- a/src/main/java/com/projectswg/holocore/services/gameplay/entertainment/EntertainmentService.java +++ b/src/main/java/com/projectswg/holocore/services/gameplay/entertainment/EntertainmentService.java @@ -317,10 +317,7 @@ public class EntertainmentService extends Service { dancer.setPerforming(true); dancer.setPosture(Posture.SKILL_ANIMATING); - // Only entertainers get XP - if (isEntertainer(dancer)) - scheduleExperienceTask(dancer, danceName); - + scheduleExperienceTask(dancer, danceName); new SystemMessageIntent(dancer.getOwner(), "@performance:dance_start_self").broadcast(); } @@ -457,7 +454,8 @@ public class EntertainmentService extends Service { int xpGained = performanceCounter * flourishXpMod; if (xpGained > 0) { - new ExperienceIntent(performer, "entertainer", xpGained).broadcast(); + if (isEntertainer(performer)) + new ExperienceIntent(performer, "entertainer", xpGained).broadcast(); performer.setPerformanceCounter(performanceCounter - 1); } }