From e58f57f6f3f7bc517887f5ef6d22741ff1af4900 Mon Sep 17 00:00:00 2001
From: Tom Pratt <tom.pratt@outlook.com>
Date: Fri, 17 Jul 2026 14:04:07 +0200
Subject: [PATCH] Auto assign wii controllers in netplay

Just copy the gamecube logic and automatically assign players to the first empty slot.

More consistent with GameCube and helps Android hosts where there is no UI for managing controller mappings currently.
---
 Source/Core/Core/NetPlayServer.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index 834544b6b3..d50fabba35 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -2272,6 +2272,15 @@ void NetPlayServer::AssignNewUserAPad(const Client& player)
       break;
     }
   }
+  for (PlayerId& mapping : m_wiimote_map)
+  {
+    // 0 means unmapped
+    if (mapping == 0)
+    {
+      mapping = player.pid;
+      break;
+    }
+  }
 }
 
 PlayerId NetPlayServer::GiveFirstAvailableIDTo(ENetPeer* player)