X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=da202e4338ab3581ed5893ecaca0e4de2abde822;hb=016830df0ab78d0dedbb91aa4ad13619cb9d624d;hp=5ec21cf034ce0e574290cd959d30dab08aee4d6d;hpb=64aed1c51d0ccd158164b8017d30026124793e90;p=xudocci.git diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java index 5ec21cf..da202e4 100644 --- a/src/main/java/net/pterodactylus/xdcc/core/Core.java +++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java @@ -435,7 +435,7 @@ public class Core extends AbstractExecutionThreadService { continue; } if (firstNetwork.get().getKey() > System.currentTimeMillis()) { - eventBus.post(new GenericMessage(String.format("Waiting %d minutes to connect to %s...", TimeUnit.MILLISECONDS.toMinutes(firstNetwork.get().getKey() - System.currentTimeMillis()), firstNetwork.get().getValue().name()))); + eventBus.post(new GenericMessage(String.format("Will connect to %2$s at %1$tH:%1$tM...", firstNetwork.get().getKey(), firstNetwork.get().getValue().name()))); synchronized (syncObject) { try { syncObject.wait(firstNetwork.get().getKey() - System.currentTimeMillis()); @@ -661,7 +661,8 @@ public class Core extends AbstractExecutionThreadService { channelBanManager.ban(channel.get()); if (channelNotJoined.reason() == registeredNicknamesOnly) { eventBus.post(new GenericMessage( - format("Not trying to join %s anymore.", channel.get()))); + format("%s requires nickname registration, suspending join for a day.", + channel.get()))); } else if (channelNotJoined.reason() == inviteOnly) { eventBus.post(new GenericMessage( format("%s is invite-only, suspending join for a day.",