Do it right

DSH105 · Feb 22, 2014 · c6616f0 · c6616f0
1 parent 7173e25
commit c6616f0
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/main/java/io/github/dsh105/echopet/config/ConfigOptions.java b/src/main/java/io/github/dsh105/echopet/config/ConfigOptions.java
@@ -7,6 +7,7 @@
 import io.github.dsh105.echopet.menu.selector.SelectorIcon;
 import io.github.dsh105.echopet.menu.selector.SelectorLayout;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 
 
@@ -127,8 +128,16 @@ public void setDefaults() {
                 set("petSelector.menu.slot-" + friendlySlot + ".petType", icon.getPetType() == null ? "" : icon.getPetType().toString());
                 set("petSelector.menu.slot-" + friendlySlot + ".materialId", icon.getMaterialId());
                 set("petSelector.menu.slot-" + friendlySlot + ".materialData", icon.getMaterialData());
-                set("petSelector.menu.slot-" + friendlySlot + ".name", icon.getName() == null ? "" : "'" + icon.getName() + "'");
-                set("petSelector.menu.slot-" + friendlySlot + ".lore", icon.getLore() == null || icon.getLore().length <= 0 ? "" : icon.getLore());
+                set("petSelector.menu.slot-" + friendlySlot + ".name", (icon.getName() == null ? "" : icon.getName()).replace(ChatColor.COLOR_CHAR, '&'));
+                String l = null;
+                for (String s : icon.getLore()) {
+                    if (l == null) {
+                        l = s.replace(ChatColor.COLOR_CHAR, '&');
+                    } else {
+                        l += ";" + s.replace(ChatColor.COLOR_CHAR, '&');
+                    }
+                }
+                set("petSelector.menu.slot-" + friendlySlot + ".lore", l == null ? "" : l);
             }
         }