Skip to content

Commit 97c82fa

Browse files
committed
Actually fix previously mentioned nick change issue
1 parent c1c8352 commit 97c82fa

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main/java/org/kitteh/irc/client/library/defaults/listener/DefaultNickListener.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,22 @@ public void nick(ClientReceiveCommandEvent event) {
5858
return;
5959
}
6060
boolean isSelf = ((User) event.getActor()).getNick().equals(this.getClient().getNick());
61+
String newNick = event.getParameters().get(0);
6162
Optional<User> user = this.getTracker().getTrackedUser(((User) event.getActor()).getNick());
6263
if (!user.isPresent()) {
6364
if (isSelf) {
64-
this.getClient().setCurrentNick(event.getParameters().get(0));
65+
this.getClient().setCurrentNick(newNick);
6566
return; // Don't fail if NICK changes while not in a channel!
6667
}
6768
this.trackException(event, "NICK message sent for user not in tracked channels");
6869
return;
6970
}
7071
User oldUser = user.get();
71-
this.getTracker().trackUserNickChange(user.get().getNick(), event.getParameters().get(0));
72-
User newUser = this.getTracker().getTrackedUser(((User) event.getActor()).getNick()).get();
72+
this.getTracker().trackUserNickChange(user.get().getNick(), newNick);
73+
User newUser = this.getTracker().getTrackedUser(newNick).get();
7374
this.fire(new UserNickChangeEvent(this.getClient(), event.getSource(), oldUser, newUser));
7475
if (isSelf) {
75-
this.getClient().setCurrentNick(event.getParameters().get(0));
76+
this.getClient().setCurrentNick(newNick);
7677
}
7778
}
7879
}

0 commit comments

Comments
 (0)