Compare commits

..

2 commits

5 changed files with 15 additions and 18 deletions

1
.gitignore vendored
View file

@ -4,3 +4,4 @@ test_server/
build/
server/
bin/
bin/*

View file

@ -1,7 +0,0 @@
api-version: "1.21"
name: CivilCore
version: 0.1.0
main: rip.iwakura.civil.Core
authors:
- hex
- grng

View file

@ -47,24 +47,27 @@ public class Core extends JavaPlugin {
.color(NamedTextColor.BLUE)
.decoration(TextDecoration.BOLD, true)
.append(Component.text(" Discord", NamedTextColor.BLUE).decoration(TextDecoration.BOLD, false)
.appendSpace()
.append(Component.text(author.getName())
.append(Component.text(": "))
.append(Component.text(message))
.color(NamedTextColor.WHITE).decoration(TextDecoration.BOLD, false)));
.appendSpace()
.append(Component.text(author.getName())
.append(Component.text(": "))
.append(Component.text(message))
.color(NamedTextColor.WHITE).decoration(TextDecoration.BOLD, false)));
}
public void sendTeamMessage(CivilPlayer author, Component message) throws SQLException {
Component deserializedMessage = renderTeamChat(author, message);
discord.sendMessage(author, PlainTextComponentSerializer.plainText().serialize(message));
for (CivilPlayer member : database.getAllPlayers(author.getTeam())) {
Player player = Bukkit.getPlayer(member.getName());
try {
Player player = Bukkit.getPlayer(member.getName());
if (!player.isOnline())
if (player == null || !player.isOnline())
continue;
player.sendMessage(deserializedMessage);
} catch (Exception e) {
continue;
player.sendMessage(deserializedMessage);
}
}
}

View file

@ -136,7 +136,7 @@ public class Team {
try {
CivilPlayer p = database.getPlayer((Player) sender);
core.sendTeamMessage(p, message);
core.sendTeamMessage(p, MiniMessage.miniMessage().deserialize(message));
return Command.SINGLE_SUCCESS;