From fb4225a377db503509785fac29ec76f7ee9f52ec Mon Sep 17 00:00:00 2001
From: Fuzzlemann <zhang.paul@ymail.com>
Date: Sat, 29 Jul 2017 10:26:58 +0200
Subject: [PATCH] Fixed some bugs resulting of my changes

---
 .../main/java/com/djrapitops/plan/utilities/HtmlUtils.java    | 4 +++-
 .../java/com/djrapitops/plan/utilities/analysis/Analysis.java | 2 +-
 .../com/djrapitops/plan/utilities/analysis/AnalysisUtils.java | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java
index 77b7078c3..5113bcef7 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java
@@ -181,12 +181,14 @@ public class HtmlUtils {
                 Html.COLOR_A, Html.COLOR_B, Html.COLOR_C, Html.COLOR_D, Html.COLOR_E, Html.COLOR_F};
 
         for (Html html : replacer) {
-            string = string.replace("§" + html.name().charAt(6), html.parse());
+            string = string.replace("§" + Character.toLowerCase(html.name().charAt(6)), html.parse());
         }
+
         int spans = string.split("<span").length - 1;
         for (int i = 0; i < spans; i++) {
             string = Html.SPAN.parse(string);
         }
+
         return string.replace("§r", "");
     }
 
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
index 79fecb3b6..32584967b 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
@@ -208,7 +208,7 @@ public class Analysis {
                 if (analysisTypes.contains(boolTot)) {
                     replaceMap.put(source.getPlaceholder(boolTot.getPlaceholderModifier()), AnalysisUtils.getBooleanTotal(boolTot, source, uuids));
                 }
-            } catch (Exception e) {
+            } catch (NoClassDefFoundError | Exception e) {
                 Log.error("A PluginData-source caused an exception: " + source.getPlaceholder("").replace("%", ""));
 
                 Log.toLog(this.getClass().getName(), e);
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java
index 705606252..4c99eddfe 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java
@@ -105,7 +105,7 @@ public class AnalysisUtils {
                     return source.parseContainer("", "Wrong Analysistype specified: " + analysisType.name());
             }
             return source.parseContainer(analysisType.getModifier(), String.valueOf(total));
-        } catch (Exception e) {
+        } catch (Exception | NoClassDefFoundError e) {
             return logPluginDataCausedError(source, e);
         }
     }