Skip to content

Commit

Permalink
Fixed #42
Browse files Browse the repository at this point in the history
  • Loading branch information
bramhaag committed Feb 26, 2017
1 parent 5835e86 commit b54c92b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 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.3-RELEASE'
version = '1.4.5-RELEASE'

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/me/bramhaag/guilds/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,11 @@ public String onPlaceholderRequest(Player player, String identifier) {
case "name":
return Placeholders.getGuild(player);
case "master":
Placeholders.getGuildMaster(player);
return Placeholders.getGuildMaster(player);
case "member_count":
Placeholders.getGuildMemberCount(player);
return Placeholders.getGuildMemberCount(player);
case "prefix":
Placeholders.getGuildPrefix(player);
return Placeholders.getGuildPrefix(player);
default:
return getConfig().getString("placeholders.default");
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/bramhaag/guilds/commands/CommandInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void execute(Player player, String[] args) {
Message.sendMessage(player, Message.COMMAND_INFO_HEADER.replace("{guild}", guild.getName()));
Message.sendMessage(player, Message.COMMAND_INFO_NAME.replace("{guild}", guild.getName(), "{prefix}", guild.getPrefix()));
Message.sendMessage(player, Message.COMMAND_INFO_MASTER.replace("{master}", Bukkit.getOfflinePlayer(guild.getGuildMaster().getUniqueId()).getName()));
Message.sendMessage(player, Message.COMMAND_INFO_MEMBER_COUNT.replace("{members}", String.valueOf(guild.getMembers().size()), "{members-online}", String.valueOf(guild.getMembers().stream().map(member -> Bukkit.getPlayer(member.getUniqueId())).filter(OfflinePlayer::isOnline).count())));
Message.sendMessage(player, Message.COMMAND_INFO_MEMBER_COUNT.replace("{members}", String.valueOf(guild.getMembers().size()), "{members-online}", String.valueOf(guild.getMembers().stream().map(member -> Bukkit.getOfflinePlayer(member.getUniqueId())).filter(OfflinePlayer::isOnline).count())));
Message.sendMessage(player, Message.COMMAND_INFO_RANK.replace("{rank}", GuildRole.getRole(guild.getMember(player.getUniqueId()).getRole()).getName()));
}
}

0 comments on commit b54c92b

Please sign in to comment.