Merge remote-tracking branch 'origin/ver/beta10' into feat/squads

Author: 7reax

API/internal/rpc/authentication.go

@@ -493,6 +493,7 @@ func (s *AuthenticationServer) Login(ctx context.Context, req *pbapi.LoginReques
 
 	whitelisted := user.Entitled(models.EntitlementWhitelisted) ||
 		user.IsPatron() ||
+		containsIgnoreCase(s.whitelist.UsernameWhitelist, user.Name) ||
 		containsIgnoreCase(s.whitelist.PersonaWhitelist, user.EAData.PersonaID)
 
 	if !whitelisted && s.whitelistEnabled {

API/internal/rpc/server_management.go

@@ -97,6 +97,8 @@ func (s *ServerManagement) GetPunishments(ctx context.Context, req *pbapi.Punish
 			continue
 		}
 
+		punishment.UserModel = user
+
 		convPunishments = append(convPunishments, punishment.Proto())
 	}
 
@@ -274,6 +276,16 @@ func (s *ServerManagement) BanPlayer(ctx context.Context, req *pbapi.ServerBanPl
 		return nil, status.Error(codes.PermissionDenied, "You cannot ban the server host")
 	}
 
+	activeBan, err := s.store.Punishments.GetBanForServer(ctx, server.HostID, target.ID)
+	if err != nil {
+		logger.L().Error("Failed to check punishment", zap.Error(err))
+		return nil, status.Error(codes.Internal, "Failed to check punishments")
+	}
+
+	if activeBan != nil {
+		return nil, status.Error(codes.PermissionDenied, "User is already banned")
+	}
+
 	var expiresAt *time.Time
 	if req.Duration != nil {
 		expiresAt = new(time.Time)

API/pkg/ws/server_manager.go

@@ -421,7 +421,6 @@ func (sm *ServerManager) HandleServerWS(w http.ResponseWriter, r *http.Request)
 		}
 
 		delete(sm.ownedServers, id)
-		sm.mu.Unlock()
 	}
 
 	sm.ownedServers[id] = &OwnedServer{Conn: conn}

CLI/lib/utils/mod_helper.dart

@@ -7,7 +7,7 @@ class ModHelper {
   ModHelper._();
 
   static List<FrostyMod> filterGameplayMods(List<FrostyMod> mods) {
-    return mods.where((mod) => ['gameplay', 'maps'].contains(mod.details.category.toLowerCase())).toList();
+    return mods.where((mod) => ['gameplay', 'maps', 'map'].contains(mod.details.category.toLowerCase())).toList();
   }
 
   static List<FrostyMod> expandMods(List<FrostyMod> mods) {

Launcher/lib/core/services/module_version_service.dart

@@ -261,6 +261,8 @@ class ModuleVersionService {
       file.deleteSync();
     }
 
+    file.createSync(recursive: true);
+
     final raf = file.openSync(mode: FileMode.write);
 
     try {

Launcher/lib/features/game/dialogs/mod_limit_dialog.dart

@@ -15,7 +15,7 @@ class ModLimitDialog extends StatelessWidget {
       ),
       content: const Text(
         '''
-        You have reached the maximum number of mods (247) that can be loaded. 
+        You have reached the maximum number of mods (1739) that can be loaded. 
         To continue you must remove some mods from your collection.
         
         This is a current technical limitation of KYBER and may be lifted in the future.

Launcher/lib/features/maxima/helper/maxima_helper.dart

@@ -61,8 +61,8 @@ class MaximaHelper {
           .launcherClient
           .getPreloadedMods(Empty());
       final modLimit = Preferences.general.enabledPreloadMods
-          ? 247 - preloadedMods.mods.length
-          : 247;
+          ? 1739 - preloadedMods.mods.length
+          : 1739;
       if (modPaths.length >= modLimit) {
         _logger.warning('Mod limit reached: ${modPaths.length}');
 

Launcher/lib/features/mods/screens/mods.dart

@@ -86,7 +86,7 @@ class _ModsPageState extends State<ModsPage> {
       _handleShiftModSelection(mod, currentIndex, state, cubit);
     }
 
-    if (state.selectedMods.isEmpty) {
+    if (cubit.state.selectedMods.isEmpty) {
       _lastSelectedIndex = -1;
     }
 
@@ -142,7 +142,7 @@ class _ModsPageState extends State<ModsPage> {
     final isDeselecting = state.selectedMods.contains(mod.filename);
 
     for (var i = start; i <= end; i++) {
-      final selectedMods = Set<String>.from(state.selectedMods);
+      final selectedMods = Set<String>.from(cubit.state.selectedMods);
       if (isDeselecting) {
         selectedMods.remove(state.mods[i].filename);
       } else {

Launcher/rust/rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2025-01-01"
+channel = "nightly-2026-04-06"
 
 targets = [
     # Windows

Module/Public/Core/Client.h

@@ -0,0 +1,57 @@
+// Copyright Armchair Developers. Licensed under GPLv3.
+
+#pragma once
+
+#include <SDK/SDK.h>
+#include <SDK/TypeInfo.h>
+#include <SDK/Types.h>
+#include <Core/EventManager.h>
+#include <Network/SocketManager.h>
+#include <Voip/VoipManager.h>
+
+#define OFFSET_GET_CLIENT_INSTANCE 0x14659DE50
+
+namespace Kyber
+{
+__int64 ClientStateChangeHk(__int64 a1, ClientState currentClientState, ClientState lastClientState);
+
+class Client : public EventListener
+{
+public:
+    Client();
+    ~Client();
+
+    void Initialize();
+    void InitializeHooks();
+
+    void HandleClientServerJoin(NetworkCreatePlayerMessage* message);
+    void RegisterClientUpdatePassListener(ClientUpdatePassListener* listener);
+    void AttemptJoinVoip();
+
+    // If proxied is true, IP is assumed to be a proxy ID
+    void JoinServer(const std::string& id, std::string ip, uint16_t port, bool spectate, bool proxied = false, bool changeState = true);
+
+    __int64 ChangeClientState(ClientState currentClientState)
+    {
+        return ClientStateChangeHk(
+            *reinterpret_cast<__int64*>(*reinterpret_cast<__int64*>(((__int64 (*)(void))OFFSET_GET_CLIENT_INSTANCE)() + 0x20) + 0x28),
+            currentClientState, m_clientState);
+    }
+
+    void OnEvent(const Event& event) override;
+
+    std::string m_joinToken;
+
+    ClientState m_clientState;
+
+    SocketManager* m_socketManager;
+    VoipManager* m_voipManager;
+    EventManager* m_eventManager;
+
+    std::vector<ClientUpdatePassListener*> m_updatePassListeners;
+
+    bool m_joining;
+    bool m_spectator;
+    bool m_connected;
+};
+} // namespace Kyber