From 32afc7c1b220c42aa5e06fb4856867684c14ba18 Mon Sep 17 00:00:00 2001
From: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
Date: Sun, 20 Jun 2021 13:51:19 +1000
Subject: [PATCH] TFGuilds Second Release Candidate
- Fixed owner not being counted
- Updated regex to include hex colour codes
---
.gitignore | 3 ++-
pom.xml | 2 +-
src/main/java/me/totalfreedom/tfguilds/guild/Guild.java | 2 +-
src/main/java/me/totalfreedom/tfguilds/util/GUtil.java | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 166641b..d38df4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/.idea/
target/
-out/
\ No newline at end of file
+out/
+TFGuilds.iml
diff --git a/pom.xml b/pom.xml
index ae98113..648c21c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
me.totalfreedom
TFGuilds
- 2021.06-RC1
+ 2021.06-RC2
jar
TFGuilds
diff --git a/src/main/java/me/totalfreedom/tfguilds/guild/Guild.java b/src/main/java/me/totalfreedom/tfguilds/guild/Guild.java
index 7ad1758..aeeab98 100644
--- a/src/main/java/me/totalfreedom/tfguilds/guild/Guild.java
+++ b/src/main/java/me/totalfreedom/tfguilds/guild/Guild.java
@@ -858,7 +858,7 @@ public class Guild
ChatColor.GRAY + " Name: " + ChatColor.GOLD + name + "\n" +
ChatColor.GRAY + " Owner: " + ChatColor.GOLD + Bukkit.getOfflinePlayer(owner).getName() + "\n" +
ChatColor.GRAY + " Moderators: " + ChatColor.GOLD + moderators.size() + "\n" +
- ChatColor.GRAY + " Members: " + ChatColor.GOLD + members.size() + "\n" +
+ ChatColor.GRAY + " Members: " + ChatColor.GOLD + (members.size() + 1) + "\n" +
ChatColor.GRAY + " Tag: " + ChatColor.GOLD + (tag != null ? GUtil.colorize(tag) : "None") + "\n" +
ChatColor.GRAY + " State: " + ChatColor.GOLD + state.name() + "\n" +
ChatColor.GRAY + " Ranks (" + ranks.size() + "): " + ChatColor.GOLD + StringUtils.join(getRankNames(), ", ") + "\n" +
diff --git a/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java b/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java
index 183926b..8d97620 100644
--- a/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java
+++ b/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java
@@ -20,7 +20,7 @@ public class GUtil
"admin", "owner", "moderator", "developer", "console", "dev", "staff",
"mod", "sra", "sta", "sa", "super admin", "telnet admin", "senior admin",
"trial mod", "trial moderator", "trialmod", "trialmoderator");
- private static final Pattern CHAT_COLOR_FORMAT = Pattern.compile("&[a-fk-or0-9]", Pattern.CASE_INSENSITIVE);
+ private static final Pattern CHAT_COLOR_FORMAT = Pattern.compile("&([a-fk-or0-9]|#[a-f0-9]{6})", Pattern.CASE_INSENSITIVE);
public static String colorize(String string)
{