cdanesi/ajQueue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
ajgeiss0702
2022-08-05 12:30:09 -07:00
parent b545687b8d fc4cf51081
commit 5619ec8d0a
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/us/ajg0702/queue/commands/commands/listqueues/ListCommand.java
+2 -2
View File
@@ -68,10 +68,10 @@ public class ListCommand extends BaseCommand {
m = m.append(Component.text("\n")); m = m.append(Component.text("\n"));
m = m.append(main.getMessages().getComponent("commands.listqueues.format", m = m.append(main.getMessages().getComponent("commands.listqueues.format",
"COLOR:" + main.getMessages().color(color), "COLOR:" + Messages.color(color),
"NAME:" + s.getAlias(), "NAME:" + s.getAlias(),
"COUNT:" + s.getQueue().size(), "COUNT:" + s.getQueue().size(),
"STATUS:" + s.getStatusString(spp) "STATUS:" + main.getMessages().getRawString("placeholders.status."+s.getStatus(spp))
)); ));
} }
sender.sendMessage(m); sender.sendMessage(m);
common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java
+7 -2
View File
@@ -118,7 +118,11 @@ public class QueueManagerImpl implements QueueManager {
versions.append(msgs.getString("errors.wrong-version.comma")); versions.append(msgs.getString("errors.wrong-version.comma"));
} }
} }
player.sendMessage(msgs.getComponent("errors.wrong-version.base", "VERSIONS:" + versions)); player.sendMessage(msgs.getComponent(
"errors.wrong-version.base",
"VERSIONS:" + versions,
"SERVER:"+server.getAlias()
));
return false; return false;
} }
@@ -381,7 +385,6 @@ public class QueueManagerImpl implements QueueManager {
if(!main.getConfig().getBoolean("send-title")) return; if(!main.getConfig().getBoolean("send-title")) return;
for(QueueServer server : servers) { for(QueueServer server : servers) {
String status = server.getStatusString();
for(QueuePlayer queuePlayer : server.getQueue()) { for(QueuePlayer queuePlayer : server.getQueue()) {
int pos = queuePlayer.getPosition(); int pos = queuePlayer.getPosition();
@@ -396,6 +399,8 @@ public class QueueManagerImpl implements QueueManager {
QueueServer singleServer = getSingleServer(player); QueueServer singleServer = getSingleServer(player);
if(singleServer == null || !singleServer.equals(server)) continue; if(singleServer == null || !singleServer.equals(server)) continue;
String status = Messages.color(main.getMessages().getRawString("placeholders.status."+server.getStatus(player)));
int time = (int) Math.round(pos * main.getTimeBetweenPlayers()); int time = (int) Math.round(pos * main.getTimeBetweenPlayers());
Component titleMessage = msgs.getComponent("title.title", Component titleMessage = msgs.getComponent("title.title",