From 2727203bed6471c38819fa1f9a94a06a3f836671 Mon Sep 17 00:00:00 2001
From: RoinujNosde <edsonpassosjr@outlook.com>
Date: Fri, 7 Feb 2020 19:48:26 -0300
Subject: [PATCH] Fixed spy chat and banned list
- The remaining chat codes (k, m, n, o, r) are now stripped from the Spy
Chat messages. Closes #550
- The banned players list is now saved to the config. Closes #546
---
.gitignore | 5 ++++-
pom.xml | 2 +-
.../java/net/sacredlabyrinth/phaed/simpleclans/Helper.java | 4 ++--
.../phaed/simpleclans/managers/SettingsManager.java | 6 ++++--
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 31c467d51..818e6c7cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
/target/
/.idea/
-SimpleClans.iml
\ No newline at end of file
+SimpleClans.iml
+/bin/
+/.classpath
+/.project
diff --git a/pom.xml b/pom.xml
index 77c392685..52bea2ca6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
<artifactId>SimpleClans</artifactId>
- <version>2.8.0</version>
+ <version>2.8.1</version>
<name>SimpleClans</name>
<url>http://dev.bukkit.org/server-mods/simpleclans/</url>
diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/Helper.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/Helper.java
index 421548546..3d64a09b1 100644
--- a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/Helper.java
+++ b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/Helper.java
@@ -400,9 +400,9 @@ public static String parseColors(String msg) {
* @return
*/
public static String stripColors(String msg) {
- String out = msg.replaceAll("[&][0-9a-f]", "");
+ String out = msg.replaceAll("[&][0-9a-fk-or]", "");
out = out.replaceAll(String.valueOf((char) 194), "");
- return out.replaceAll("[\u00a7][0-9a-f]", "");
+ return out.replaceAll("[\u00a7][0-9a-fk-or]", "");
}
/*
diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/SettingsManager.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/SettingsManager.java
index 9a8301966..d27b4bb8a 100644
--- a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/SettingsManager.java
+++ b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/SettingsManager.java
@@ -690,7 +690,8 @@ public void addBanned(UUID playerUniqueId) {
if (!bannedPlayers.contains(playerUniqueId.toString())) {
bannedPlayers.add(playerUniqueId.toString());
}
-
+
+ getConfig().set("settings.banned-players", bannedPlayers);
save();
}
@@ -703,7 +704,8 @@ public void removeBanned(UUID playerUniqueId) {
if (bannedPlayers.contains(playerUniqueId.toString())) {
bannedPlayers.remove(playerUniqueId.toString());
}
-
+
+ getConfig().set("settings.banned-players", bannedPlayers);
save();
}