X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=99c5ab691c3178f609d4f71cb9a32a0dbc059714;hb=b067063ea6f1cf5077215d48127da12e78936b25;hp=00d1fbdf4a949ffd78da8d3873ce6351601f3890;hpb=44825f1cf5ddb021cbf9b8416e8649e768905e77;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 00d1fbd..99c5ab6 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());
@@ -503,9 +503,6 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 		networkConnections.remove(network.get());
-		if (!connection.established()) {
-			return;
-		}
 
 		/* find all channels that need to be removed. */
 		for (Collection<Channel> channels : ImmutableList.of(joinedChannels, extraChannels)) {
@@ -658,30 +655,24 @@ public class Core extends AbstractExecutionThreadService {
 				.forEach(bot -> networkBots.row(network.get())
 						.remove(bot.name()));
 
+		channelBanManager.ban(channel.get());
 		if (channelNotJoined.reason() == registeredNicknamesOnly) {
-			channels.remove(channel.get());
 			eventBus.post(new GenericMessage(
-					format("Not trying to join %s anymore.", channel.get())));
-			return;
-		}
-		if (channelNotJoined.reason() == inviteOnly) {
-			channelBanManager.ban(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.",
 							channel.get())));
-			return;
-		}
-		if (channelNotJoined.reason() == banned) {
-			channelBanManager.ban(channel.get());
+		} else if (channelNotJoined.reason() == banned) {
 			eventBus.post(new GenericMessage(
 					format("Banned from %s, suspending join for a day.",
 							channel.get())));
-			return;
+		} else {
+			eventBus.post(new GenericMessage(
+					format("Could not join %s: %s", channelNotJoined.channel(),
+							channelNotJoined.reason())));
 		}
-
-		eventBus.post(new GenericMessage(
-				format("Could not join %s: %s", channelNotJoined.channel(),
-						channelNotJoined.reason())));
 	}
 
 	/**