From e411d6aa6e6a83e010dffebda0806bc368c24742 Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Sun, 3 Apr 2016 02:23:01 +0200 Subject: [PATCH] Fixed an issue where songs were being loaded into EntertainmentService.danceMap --- src/services/commands/EntertainmentService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/services/commands/EntertainmentService.java b/src/services/commands/EntertainmentService.java index 705f8a1d2..44e3eda32 100644 --- a/src/services/commands/EntertainmentService.java +++ b/src/services/commands/EntertainmentService.java @@ -34,9 +34,15 @@ public class EntertainmentService extends Service { DatatableData performanceTable = (DatatableData) ClientFactory.getInfoFromFile("datatables/performance/performance.iff"); for (int i = 0; i < performanceTable.getRowCount(); i++) { - danceMap.put((String) performanceTable.getCell(i, 0), (int) performanceTable.getCell(i, 5)); // performanceName, danceVisualId + String requiredDance = (String) performanceTable.getCell(i, 4); + + if(!requiredDance.isEmpty()) { + danceMap.put((String) performanceTable.getCell(i, 0), (int) performanceTable.getCell(i, 5)); // performanceName, danceVisualId + } } - + + System.out.println(danceMap); + return super.initialize(); }