Skip to content

Commit

Permalink
Updated to 1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bramhaag committed Feb 4, 2017
1 parent ea61ce2 commit 13a8b13
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
66 changes: 33 additions & 33 deletions src/main/resources/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 13a8b13

Please sign in to comment.