X-Git-Url: https://git.pterodactylus.net/?p=xudocci.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=30344be9b2c831023ce74edf1a2b8e7e0446d0fd;hp=d12cc77926b63881b33d2044a5d0154a455ad32d;hb=1aa7f843043b8723a02b4bbd88eb21ae8b7db881;hpb=3ecc370cb08ba0bbe12655dd5339a21cbba698f1

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index d12cc77..30344be 100644
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -370,8 +370,11 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 					new CtcpHandler(eventBus, this),
 					new ChannelNickHandler(eventBus, this, prefixHandler),
 					new SimpleCommandHandler()
-							.addCommand("431", (parameters) -> eventBus.post(
-									new NoNicknameGivenReceived(this))),
+							.addCommand("431", (s, p) -> eventBus.post(
+									new NoNicknameGivenReceived(this)))
+							.addCommand("NICK", (s, p) -> eventBus.post(
+									new NicknameChanged(this, s.get(),
+											p.get(0)))),
 					new MotdHandler(eventBus, this),
 					new ChannelNotJoinedHandler(eventBus, this),
 					new ConnectionEstablishHandler(eventBus, this),
@@ -401,10 +404,6 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 						eventBus.post(new NicknameInUseReceived(this, reply));
 					}
 
-				/* client stuff. */
-				} else if (command.equalsIgnoreCase("NICK")) {
-					eventBus.post(new NicknameChanged(this, reply.source().get(), parameters.get(0)));
-
 				/* channel stuff. */
 				} else if (command.equalsIgnoreCase("JOIN")) {
 					eventBus.post(new ChannelJoined(this, parameters.get(0), reply.source().get()));