Compare commits
2 commits
26971e75bb
...
6cb0f04170
Author | SHA1 | Date | |
---|---|---|---|
6cb0f04170 | |||
4361201b78 |
5 changed files with 15 additions and 18 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -4,3 +4,4 @@ test_server/
|
||||||
build/
|
build/
|
||||||
server/
|
server/
|
||||||
bin/
|
bin/
|
||||||
|
bin/*
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
api-version: "1.21"
|
|
||||||
name: CivilCore
|
|
||||||
version: 0.1.0
|
|
||||||
main: rip.iwakura.civil.Core
|
|
||||||
authors:
|
|
||||||
- hex
|
|
||||||
- grng
|
|
Binary file not shown.
|
@ -54,17 +54,20 @@ public class Core extends JavaPlugin {
|
||||||
.color(NamedTextColor.WHITE).decoration(TextDecoration.BOLD, false)));
|
.color(NamedTextColor.WHITE).decoration(TextDecoration.BOLD, false)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void sendTeamMessage(CivilPlayer author, Component message) throws SQLException {
|
public void sendTeamMessage(CivilPlayer author, Component message) throws SQLException {
|
||||||
Component deserializedMessage = renderTeamChat(author, message);
|
Component deserializedMessage = renderTeamChat(author, message);
|
||||||
discord.sendMessage(author, PlainTextComponentSerializer.plainText().serialize(message));
|
discord.sendMessage(author, PlainTextComponentSerializer.plainText().serialize(message));
|
||||||
for (CivilPlayer member : database.getAllPlayers(author.getTeam())) {
|
for (CivilPlayer member : database.getAllPlayers(author.getTeam())) {
|
||||||
|
try {
|
||||||
Player player = Bukkit.getPlayer(member.getName());
|
Player player = Bukkit.getPlayer(member.getName());
|
||||||
|
|
||||||
if (!player.isOnline())
|
if (player == null || !player.isOnline())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
player.sendMessage(deserializedMessage);
|
player.sendMessage(deserializedMessage);
|
||||||
|
} catch (Exception e) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -136,7 +136,7 @@ public class Team {
|
||||||
try {
|
try {
|
||||||
CivilPlayer p = database.getPlayer((Player) sender);
|
CivilPlayer p = database.getPlayer((Player) sender);
|
||||||
|
|
||||||
core.sendTeamMessage(p, message);
|
core.sendTeamMessage(p, MiniMessage.miniMessage().deserialize(message));
|
||||||
|
|
||||||
return Command.SINGLE_SUCCESS;
|
return Command.SINGLE_SUCCESS;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue