From 13a8b136979ea129d82d69b87ec28a337b65c3db Mon Sep 17 00:00:00 2001
From: Bram Hagens <bramhagens@hotmail.nl>
Date: Sat, 4 Feb 2017 21:51:09 +0100
Subject: [PATCH] Updated to 1.4.1

---
 build.gradle                                  |  2 +-
 .../guilds/placeholders/Placeholders.java     |  2 +-
 src/main/resources/config.yml                 | 66 +++++++++----------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6bd5538..6bdd74f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'rebel'
 
 group = 'me.bramhaag'
-version = '1.4.0-RELEASE'
+version = '1.4.1-RELEASE'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
diff --git a/src/main/java/me/bramhaag/guilds/placeholders/Placeholders.java b/src/main/java/me/bramhaag/guilds/placeholders/Placeholders.java
index 6b0082e..683c0a8 100644
--- a/src/main/java/me/bramhaag/guilds/placeholders/Placeholders.java
+++ b/src/main/java/me/bramhaag/guilds/placeholders/Placeholders.java
@@ -12,7 +12,7 @@ public static String getGuild(Player player) {
             return "N/A";
         }
 
-        return guild.getPrefix();
+        return guild.getName();
     }
 
     public static String getGuildMaster(Player player) {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 8c4f5a1..03219fd 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -22,6 +22,39 @@ prefix:
 # Set the format for the prefix
   format: "&c[{prefix}] "
 
+members:
+# Set to -1 to disable
+  max-members: 64
+
+chat:
+# Enable or disable custom chat formatting for players who are in a guild
+  enable: true
+# Custom chat format (only applied when the setting above is set to true)
+#   - "{guild}" is replaced with the guild prefix
+#   - "%s" (First) is replaced with the player's name
+#   - "%s" (Second) is replaced with the player's message
+  format: "{guild} <%s>: %s"
+
+scoreboard:
+# Enable or disable scoreboard which handles friendly fire, prefixes and guild invisibility
+  enable: false
+# Enable or disable friendly fire
+  friendly-fire: false
+# Enable or disable being able to see invisible guild members
+  see-invisible: true
+
+database:
+# Set the type of the database (Either JSON or MySQL)
+  type: JSON
+# Uncomment when using MySQL
+#  host: "127.0.0.1"
+#  port: 3306
+#  username: "root"
+#  password: "password"
+## Note: Database needs to be created manually
+#  database: "guilds"
+#  pool-size: 10
+
 roles:
   0:
     name: "GuildMaster"
@@ -80,39 +113,6 @@ roles:
       change-master: false
       remove-guild: false
 
-members:
-# Set to -1 to disable
-  max-members: 64
-
-chat:
-# Enable or disable custom chat formatting for players who are in a guild
-  enable: true
-# Custom chat format (only applied when the setting above is set to true)
-#   - "{guild}" is replaced with the guild prefix
-#   - "%s" (First) is replaced with the player's name
-#   - "%s" (Second) is replaced with the player's message
-  format: "{guild} <%s>: %s"
-
-scoreboard:
-# Enable or disable scoreboard which handles friendly fire, prefixes and guild invisibility
-  enable: false
-# Enable or disable friendly fire
-  friendly-fire: false
-# Enable or disable being able to see invisible guild members
-  see-invisible: true
-
-database:
-# Set the type of the database (Either JSON or MySQL)
-  type: JSON
-# Uncomment when using MySQL
-#  host: "127.0.0.1"
-#  port: 3306
-#  username: "root"
-#  password: "password"
-## Note: Database needs to be created manually
-#  database: "guilds"
-#  pool-size: 10
-
 messages:
   command:
     error: