mirror of
https://github.com/Maxlego08/zKoth.git
synced 2024-11-25 12:25:14 +01:00
📝 Fixs
This commit is contained in:
parent
44ebf24db3
commit
6f3248eefa
@ -68,6 +68,10 @@
|
|||||||
<pattern>com.cryptomorin.xseries</pattern>
|
<pattern>com.cryptomorin.xseries</pattern>
|
||||||
<shadedPattern>fr.maxlego08.koth.xseries</shadedPattern>
|
<shadedPattern>fr.maxlego08.koth.xseries</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>fr.mrmicky.fastboard</pattern>
|
||||||
|
<shadedPattern>fr.maxlego08.koth.fastboard</shadedPattern>
|
||||||
|
</relocation>
|
||||||
</relocations>
|
</relocations>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
@ -187,7 +191,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.UlrichBR</groupId>
|
<groupId>com.github.UlrichBR</groupId>
|
||||||
<artifactId>UClansV7-API</artifactId>
|
<artifactId>UClansV7-API</artifactId>
|
||||||
<version>7.7.0-r1</version>
|
<version>7.13.0-R1</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
6
pom.xml
6
pom.xml
@ -74,6 +74,10 @@
|
|||||||
<pattern>com.cryptomorin.xseries</pattern>
|
<pattern>com.cryptomorin.xseries</pattern>
|
||||||
<shadedPattern>fr.maxlego08.koth.xseries</shadedPattern>
|
<shadedPattern>fr.maxlego08.koth.xseries</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>fr.mrmicky.fastboard</pattern>
|
||||||
|
<shadedPattern>fr.maxlego08.koth.fastboard</shadedPattern>
|
||||||
|
</relocation>
|
||||||
</relocations>
|
</relocations>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
@ -150,7 +154,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>fr.mrmicky</groupId>
|
<groupId>fr.mrmicky</groupId>
|
||||||
<artifactId>fastboard</artifactId>
|
<artifactId>fastboard</artifactId>
|
||||||
<version>2.0.2</version>
|
<version>2.1.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.booksaw</groupId>
|
<groupId>com.github.booksaw</groupId>
|
||||||
|
@ -785,7 +785,7 @@ public class ZKoth extends ZUtils implements Koth {
|
|||||||
string = string.replace("%centerY%", String.valueOf(centerLocation.getBlockY()));
|
string = string.replace("%centerY%", String.valueOf(centerLocation.getBlockY()));
|
||||||
string = string.replace("%centerZ%", String.valueOf(centerLocation.getBlockZ()));
|
string = string.replace("%centerZ%", String.valueOf(centerLocation.getBlockZ()));
|
||||||
|
|
||||||
return ColorTransformer.transformColors(string);
|
return string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -2,6 +2,7 @@ package fr.maxlego08.koth.hook.teams;
|
|||||||
|
|
||||||
import fr.maxlego08.koth.KothPlugin;
|
import fr.maxlego08.koth.KothPlugin;
|
||||||
import fr.maxlego08.koth.api.KothTeam;
|
import fr.maxlego08.koth.api.KothTeam;
|
||||||
|
import fr.maxlego08.koth.zcore.utils.ColorTransformer;
|
||||||
import me.ulrich.clans.Clans;
|
import me.ulrich.clans.Clans;
|
||||||
import me.ulrich.clans.data.ClanData;
|
import me.ulrich.clans.data.ClanData;
|
||||||
import me.ulrich.clans.events.ClanDeleteEvent;
|
import me.ulrich.clans.events.ClanDeleteEvent;
|
||||||
@ -28,7 +29,7 @@ public class UltimateClan implements KothTeam {
|
|||||||
@Override
|
@Override
|
||||||
public String getTeamName(OfflinePlayer player) {
|
public String getTeamName(OfflinePlayer player) {
|
||||||
Optional<ClanData> optional = this.clans.getPlayerAPI().getPlayerClan(player.getUniqueId());
|
Optional<ClanData> optional = this.clans.getPlayerAPI().getPlayerClan(player.getUniqueId());
|
||||||
return optional.isPresent() ? optional.get().getTag() : player.getName();
|
return optional.isPresent() ? ColorTransformer.transformColors(optional.get().getTag()) : player.getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -540,6 +540,9 @@ public abstract class ZUtils extends MessageUtils {
|
|||||||
*/
|
*/
|
||||||
protected String color(String message) {
|
protected String color(String message) {
|
||||||
if (message == null) return null;
|
if (message == null) return null;
|
||||||
|
|
||||||
|
message = ColorTransformer.transformColors(message);
|
||||||
|
|
||||||
if (NmsVersion.nmsVersion.isHexVersion()) {
|
if (NmsVersion.nmsVersion.isHexVersion()) {
|
||||||
Pattern pattern = Pattern.compile("#[a-fA-F0-9]{6}");
|
Pattern pattern = Pattern.compile("#[a-fA-F0-9]{6}");
|
||||||
Matcher matcher = pattern.matcher(message);
|
Matcher matcher = pattern.matcher(message);
|
||||||
|
Loading…
Reference in New Issue
Block a user