Merge pull request #476 from frank-weinberg/bugfix/penalty-codes

Fix setting up penalty codes
rollerderby · Aug 16, 2020 · 194a4eb · 194a4eb
2 parents 2b2448f + 017f1c8
commit 194a4eb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/com/carolinarollergirls/scoreboard/penalties/PenaltyCodesManager.java b/src/com/carolinarollergirls/scoreboard/penalties/PenaltyCodesManager.java
@@ -22,7 +22,7 @@ public PenaltyCodesManager(ScoreBoard parent) {
         super(parent, "", ScoreBoard.PENALTY_CODES);
         addProperties(CODE);
         this.parent = parent;
-        loadFromJSON(parent.getRulesets().get(Rule.PENALTIES_FILE));
+        setDefinitions(loadFromJSON(parent.getRulesets().get(Rule.PENALTIES_FILE)));
         parent.addScoreBoardListener(
                 new ConditionalScoreBoardListener<>(Rulesets.class, Rulesets.CURRENT_RULE, rulesetChangeListener));
     }
@@ -54,5 +54,5 @@ public void scoreBoardChange(ScoreBoardEvent<?> event) {
         }
     };
 
-    Child<PenaltyCode> CODE = new Child<>(PenaltyCode.class, "PenaltyCode");
+    Child<PenaltyCode> CODE = new Child<>(PenaltyCode.class, "Code");
 }