X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=a14c7390846616d59fe48d74d3dd17d87a1425ac;hb=a5a04bea966d1e8b718ae47cd7f913f1d877e486;hp=332b0b12ec2ca007b80f17f1671828e1653fb45c;hpb=a6afa8e9183160cc4ea87c4ddeaa3b60142c84c7;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index 332b0b1..a14c739 100644
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -387,7 +387,11 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 											s.get(), getOptional(p, 1)))
 							.addCommand("QUIT",
 									(s, p) -> new ClientQuit(this, s.get(),
-											p.get(0))),
+											p.get(0)))
+							.addCommand("KICK",
+									(s, p) -> new KickedFromChannel(this,
+											p.get(0), s.get(), p.get(1),
+											getOptional(p, 2))),
 					new MotdHandler(eventBus, this),
 					new ChannelNotJoinedHandler(eventBus, this),
 					new ConnectionEstablishHandler(eventBus, this),
@@ -417,17 +421,11 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 						eventBus.post(new NicknameInUseReceived(this, reply));
 					}
 
-				/* channel stuff. */
-				} else if (command.equals("331")) {
-					/* no topic is set. */
 
 				/* basic connection housekeeping. */
 				} else if (command.equalsIgnoreCase("PING")) {
 					connectionHandler.sendCommand("PONG", getOptional(parameters, 0), getOptional(parameters, 1));
 
-				} else if (command.equalsIgnoreCase("KICK")) {
-					eventBus.post(new KickedFromChannel(this, parameters.get(0), reply.source().get(), parameters.get(1), getOptional(parameters, 2)));
-
 				/* okay, everything else. */
 				} else {
 					eventBus.post(new UnknownReplyReceived(this, reply));