TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-15 05:33:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.x' of https://github.com/drtshock/Essentials into 2.x

Browse source
This commit is contained in:
vemacs 2015-07-28 19:20:49 -06:00
commit fae159cdbd
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
View file

@ -4,6 +4,7 @@ import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.IEssentials; import net.ess3.api.IEssentials;
import net.ess3.api.MaxMoneyException; import net.ess3.api.MaxMoneyException;
import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;
@ -86,7 +87,7 @@ public class SignBlockListener implements Listener {
for (Signs signs : Signs.values()) { for (Signs signs : Signs.values()) {
final EssentialsSign sign = signs.getSign(); final EssentialsSign sign = signs.getSign();
if (topLine.equalsIgnoreCase(sign.getSuccessName())) { if (topLine.equalsIgnoreCase(sign.getSuccessName())) {
event.setLine(0, FormatUtil.stripFormat(topLine)); event.setLine(0, ChatColor.stripColor(topLine));
} }
} }
} }

4
Essentials/src/com/earth2me/essentials/utils/FormatUtil.java
View file

@ -1,13 +1,13 @@
package com.earth2me.essentials.utils; package com.earth2me.essentials.utils;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import org.bukkit.ChatColor;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class FormatUtil { public class FormatUtil {
//Vanilla patterns used to strip existing formats //Vanilla patterns used to strip existing formats
static final transient Pattern VANILLA_PATTERN = Pattern.compile("\u00a7+[0-9A-FK-ORa-fk-or]?");
static final transient Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00a7+[0-9A-Fa-f]"); static final transient Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00a7+[0-9A-Fa-f]");
static final transient Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00a7+[Kk]"); static final transient Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00a7+[Kk]");
static final transient Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00a7+[L-ORl-or]"); static final transient Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00a7+[L-ORl-or]");
@ -27,7 +27,7 @@ public class FormatUtil {
if (input == null) { if (input == null) {
return null; return null;
} }
return stripColor(input, VANILLA_PATTERN); return ChatColor.stripColor(input);
} }
//This method is used to simply strip the & convention colour codes //This method is used to simply strip the & convention colour codes