Users: Don't merge unregistered names across IPs

Fixes #7594
smogon · Oct 30, 2020 · 1d9c24c · 1d9c24c
1 parent 42f491a
commit 1d9c24c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/users.ts b/server/users.ts
@@ -727,7 +727,7 @@ export class User extends Chat.MessageContext {
 
 	handleRename(name: string, userid: ID, newlyRegistered: boolean, userType: string) {
 		const conflictUser = users.get(userid);
-		if (conflictUser && !conflictUser.registered && conflictUser.connected) {
+		if (conflictUser && !conflictUser.registered && (conflictUser.latestIp !== this.latestIp || conflictUser.connected)) {
 			if (newlyRegistered && userType !== '1') {
 				if (conflictUser !== this) conflictUser.resetName();
 			} else {