diff --git a/.gitignore b/.gitignore index b161ed0..9108392 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ test_server/ build/ server/ bin/ -bin/* diff --git a/bin/main/paper-plugin.yml b/bin/main/paper-plugin.yml new file mode 100644 index 0000000..5db0a58 --- /dev/null +++ b/bin/main/paper-plugin.yml @@ -0,0 +1,7 @@ +api-version: "1.21" +name: CivilCore +version: 0.1.0 +main: rip.iwakura.civil.Core +authors: + - hex + - grng diff --git a/bin/main/rip/iwakura/civil/Core.class b/bin/main/rip/iwakura/civil/Core.class new file mode 100644 index 0000000..62d9a58 Binary files /dev/null and b/bin/main/rip/iwakura/civil/Core.class differ diff --git a/src/main/java/rip/iwakura/civil/Core.java b/src/main/java/rip/iwakura/civil/Core.java index c2b5fd1..1f21b89 100644 --- a/src/main/java/rip/iwakura/civil/Core.java +++ b/src/main/java/rip/iwakura/civil/Core.java @@ -47,27 +47,24 @@ 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())) { - try { - Player player = Bukkit.getPlayer(member.getName()); + Player player = Bukkit.getPlayer(member.getName()); - if (player == null || !player.isOnline()) - continue; - - player.sendMessage(deserializedMessage); - } catch (Exception e) { + if (!player.isOnline()) continue; - } + + player.sendMessage(deserializedMessage); } } diff --git a/src/main/java/rip/iwakura/civil/commands/Team.java b/src/main/java/rip/iwakura/civil/commands/Team.java index fb56dc4..8db4450 100644 --- a/src/main/java/rip/iwakura/civil/commands/Team.java +++ b/src/main/java/rip/iwakura/civil/commands/Team.java @@ -136,7 +136,7 @@ public class Team { try { CivilPlayer p = database.getPlayer((Player) sender); - core.sendTeamMessage(p, MiniMessage.miniMessage().deserialize(message)); + core.sendTeamMessage(p, message); return Command.SINGLE_SUCCESS;