Release v1.3.3

.github/workflows/build.yml

@@ -250,14 +250,14 @@ jobs:
       run: |
         mkdir -p ./linux-runtimes
         cd ./linux-runtimes
-        wget https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0/dotnet-runtime-10.0.0-linux-x64.tar.gz
+        wget https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.7/dotnet-runtime-10.0.7-linux-x64.tar.gz
         mkdir -p content
-        tar -xzf dotnet-runtime-10.0.0-linux-x64.tar.gz -C content
+        tar -xzf dotnet-runtime-10.0.7-linux-x64.tar.gz -C content
         cd ..
         mkdir -p ./windows-runtimes
         cd ./windows-runtimes
-        wget https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0/dotnet-runtime-10.0.0-win-x64.zip
-        unzip dotnet-runtime-10.0.0-win-x64.zip -d content
+        wget https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.7/dotnet-runtime-10.0.7-win-x64.zip
+        unzip dotnet-runtime-10.0.7-win-x64.zip -d content
         cd ..
 
     - name: Create package
@@ -283,8 +283,8 @@ jobs:
         cp -r linux-runtimes/content/ ${{ env.LINUX_FOLDER }}-with-runtimes/swiftlys2/bin/managed/dotnet
         cp -r windows-runtimes/content/ ${{ env.WINDOWS_FOLDER }}-with-runtimes/swiftlys2/bin/managed/dotnet
 
-        cp linux-runtimes/content/host/fxr/10.0.0/libhostfxr.so ${{ env.LINUX_FOLDER }}-with-runtimes/swiftlys2/bin/linuxsteamrt64/libhostfxr.so
-        cp windows-runtimes/content/host/fxr/10.0.0/hostfxr.dll ${{ env.WINDOWS_FOLDER }}-with-runtimes/swiftlys2/bin/win64/hostfxr.dll
+        cp linux-runtimes/content/host/fxr/10.0.7/libhostfxr.so ${{ env.LINUX_FOLDER }}-with-runtimes/swiftlys2/bin/linuxsteamrt64/libhostfxr.so
+        cp windows-runtimes/content/host/fxr/10.0.7/hostfxr.dll ${{ env.WINDOWS_FOLDER }}-with-runtimes/swiftlys2/bin/win64/hostfxr.dll
 
         mkdir -p ${{ env.LINUX_FOLDER }}/addons/
         mkdir -p ${{ env.WINDOWS_FOLDER }}/addons/

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "vendor/metamod"]
-	path = vendor/metamod
-	url = https://github.com/alliedmodders/metamod-source
 [submodule "vendor/s2sdk"]
 	path = vendor/s2sdk
 	url = https://github.com/swiftly-solution/s2sdk

managed/SwiftlyS2.PluginTemplate/SwiftlyS2.CS2.PluginTemplate.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <PackageId>SwiftlyS2.CS2.PluginTemplate</PackageId>
     <Authors>SwiftlyS2 Team</Authors>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Description>This is a template for creating a SwiftlyS2 plugin.</Description>
     <PackageType>Template</PackageType>
     <PackageIcon>icon.png</PackageIcon>

managed/SwiftlyS2.PluginTemplate/templates/PluginId.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" ExcludeAssets="runtime" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" ExcludeAssets="runtime" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" ExcludeAssets="runtime" PrivateAssets="all" />
-    <PackageReference Include="SwiftlyS2.CS2" Version="1.1.0" ExcludeAssets="runtime" PrivateAssets="all" />
+    <PackageReference Include="SwiftlyS2.CS2" Version="*" ExcludeAssets="runtime" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

managed/src/SwiftlyS2.Core/Bootstrap.cs

@@ -12,6 +12,7 @@
 using SwiftlyS2.Core.Services;
 using SwiftlyS2.Core.Translations;
 using SwiftlyS2.Shared.SteamAPI;
+using SwiftlyS2.Shared.Misc;
 
 namespace SwiftlyS2.Core;
 
@@ -65,6 +66,13 @@ public static void Start( IntPtr nativeTable, int nativeTableSize, string basePa
         GameFunctions.Initialize();
         FileLogger.Initialize(logPath);
 
+        var redirector = new ConsoleRedirector();
+        Console.SetOut(redirector);
+        Console.SetError(redirector);
+        AnsiConsole.Console = AnsiConsole.Create(new AnsiConsoleSettings {
+            Out = new AnsiConsoleOutput(redirector)
+        });
+
         AnsiConsole.Write(new FigletText("SwiftlyS2").LeftJustified().Color(Color.LightSteelBlue1));
 
         sw2Host = Host.CreateDefaultBuilder()

managed/src/SwiftlyS2.Core/Modules/Convars/ConVar.cs

@@ -347,7 +347,7 @@ public T GetValue()
     {
         unsafe
         {
-            return Type != EConVarType.EConVarType_String ? Unsafe.Read<T>((void*)ValuePtr) : (T)(object)ValuePtr.AsRef<CUtlString>().Value;
+            return Type != EConVarType.EConVarType_String ? Unsafe.Read<T>((void*)ValuePtr) : (T)(object)ValueAsString;
         }
     }
 

managed/src/SwiftlyS2.Core/Modules/Database/DatabaseService.cs

@@ -18,18 +18,18 @@ static DatabaseService()
     {
     }
 
-    public DatabaseService( ILogger<DatabaseService> logger )
+    public DatabaseService(ILogger<DatabaseService> logger)
     {
         this.logger = logger;
         this.connectionFactories.Clear();
     }
 
-    private string ResolveConnectionName( string connectionName )
+    private string ResolveConnectionName(string connectionName)
     {
         return NativeDatabase.ConnectionExists(connectionName) ? connectionName : NativeDatabase.GetDefaultConnectionName();
     }
 
-    private Func<IDbConnection> GetOrCreateConnectionFactory( string connectionName )
+    private Func<IDbConnection> GetOrCreateConnectionFactory(string connectionName)
     {
         var resolvedName = ResolveConnectionName(connectionName);
 
@@ -56,7 +56,7 @@ private Func<IDbConnection> GetOrCreateConnectionFactory( string connectionName
         }
     }
 
-    private static Func<IDbConnection> CreateConnectionFactory( string connectionName )
+    private static Func<IDbConnection> CreateConnectionFactory(string connectionName)
     {
         var driver = NativeDatabase.GetConnectionDriver(connectionName);
         var host = NativeDatabase.GetConnectionHost(connectionName);
@@ -66,23 +66,25 @@ private static Func<IDbConnection> CreateConnectionFactory( string connectionNam
         var timeout = NativeDatabase.GetConnectionTimeout(connectionName);
         var port = NativeDatabase.GetConnectionPort(connectionName);
 
-        return driver switch {
+        return driver switch
+        {
             "sqlite" => CreateSqliteFactory(database),
             "mysql" => CreateMySqlFactory(host, port, database, user, pass, timeout),
             "postgresql" => CreatePostgresFactory(host, port, database, user, pass, timeout),
             _ => throw new NotSupportedException($"Unsupported database driver: {driver}")
         };
     }
 
-    private static Func<IDbConnection> CreateSqliteFactory( string database )
+    private static Func<IDbConnection> CreateSqliteFactory(string database)
     {
         var connStr = $"Data Source={database}";
         return () => new SQLiteConnection(connStr);
     }
 
-    private static Func<IDbConnection> CreateMySqlFactory( string host, ushort port, string database, string user, string pass, uint timeout )
+    private static Func<IDbConnection> CreateMySqlFactory(string host, ushort port, string database, string user, string pass, uint timeout)
     {
-        var builder = new MySqlConnectionStringBuilder {
+        var builder = new MySqlConnectionStringBuilder
+        {
             Server = host,
             Port = port > 0 ? port : 3306u,
             Database = database,
@@ -99,9 +101,10 @@ private static Func<IDbConnection> CreateMySqlFactory( string host, ushort port,
         return () => new MySqlConnection(connStr);
     }
 
-    private static Func<IDbConnection> CreatePostgresFactory( string host, ushort port, string database, string user, string pass, uint timeout )
+    private static Func<IDbConnection> CreatePostgresFactory(string host, ushort port, string database, string user, string pass, uint timeout)
     {
-        var builder = new NpgsqlConnectionStringBuilder {
+        var builder = new NpgsqlConnectionStringBuilder
+        {
             Host = host,
             Port = port > 0 ? port : 5432,
             Database = database,
@@ -118,12 +121,12 @@ private static Func<IDbConnection> CreatePostgresFactory( string host, ushort po
         return () => new NpgsqlConnection(connStr);
     }
 
-    public string GetConnectionString( string connectionName )
+    public string GetConnectionString(string connectionName)
     {
         return GetConnectionInfo(connectionName).ToString();
     }
 
-    public DatabaseConnectionInfo GetConnectionInfo( string connectionName )
+    public DatabaseConnectionInfo GetConnectionInfo(string connectionName)
     {
         var resolvedName = ResolveConnectionName(connectionName);
         return new DatabaseConnectionInfo(
@@ -138,7 +141,7 @@ public DatabaseConnectionInfo GetConnectionInfo( string connectionName )
         );
     }
 
-    public IDbConnection GetConnection( string connectionName )
+    public IDbConnection GetConnection(string connectionName)
     {
         return GetOrCreateConnectionFactory(connectionName)();
     }

managed/src/SwiftlyS2.Core/Modules/Engine/CommandTrackerManager.cs

@@ -130,7 +130,20 @@ private void ProcessCommandEnd()
                 output = output.Append(line);
             }
 
-            _ = Task.Run(() => command.Callback.Invoke(output.ToString()));
+            _ = Task.Run(() =>
+            {
+                try
+                {
+                    command.Callback.Invoke(output.ToString());
+                } catch (Exception ex)
+                {
+                    if (!GlobalExceptionHandler.Handle(ref ex))
+                    {
+                        return;
+                    }
+                    AnsiConsole.WriteException(ex);
+                }
+            });
         }
     }
 

managed/src/SwiftlyS2.Core/Modules/EntitySystem/EntityManager.cs

@@ -18,7 +18,8 @@ public static CEntityInstance OnEntityCreated( nint entityPtr )
 
         _Dummy.DangerousSetHandle(entityPtr);
         var index = _Dummy.Index;
-        var entity = ClassConvertor.ConvertEntityByDesignerName(entityPtr, _Dummy.DesignerName);
+        var designerName = _Dummy.DesignerName;
+        var entity = ClassConvertor.ConvertEntityByDesignerName(entityPtr, designerName);
         lock (_lock)
         {
             try
@@ -52,21 +53,18 @@ public static CEntityInstance OnEntityCreated( nint entityPtr )
 
     public static CEntityInstance? GetEntityByAddress( nint address )
     {
+        if (address == 0) return null;
+
         lock (_lock)
         {
-            try
-            {
-                return !_PtrToIndex.TryGetValue(address, out var value) ? null : _Entities[value];
-            }
-            catch
-            {
-                return null;
-            }
+            return !_PtrToIndex.TryGetValue(address, out var value) ? null : _Entities[value];
         }
     }
 
     public static void OnEntityDeleted( nint entityPtr )
     {
+        if (entityPtr == 0) return;
+
         lock (_lock)
         {
             try
@@ -102,16 +100,11 @@ public static IEnumerable<CEntityInstance> GetAllEntities()
 
     public static bool IsAddressValid( nint address )
     {
+        if (address == 0) return false;
+
         lock (_lock)
         {
-            try
-            {
-                return _PtrToIndex.ContainsKey(address);
-            }
-            catch
-            {
-                return false;
-            }
+            return _PtrToIndex.ContainsKey(address);
         }
     }
 

managed/src/SwiftlyS2.Core/Modules/EntitySystem/EntitySystem.cs

@@ -12,11 +12,12 @@ namespace SwiftlyS2.Core.EntitySystem;
 
 internal class EntitySystemService : IEntitySystemService, IDisposable
 {
+    private CCSGameRulesProxy? cachedGameRulesProxy;
+    private CCSGameRules? cachedGameRules;
     private readonly IEventSubscriber eventSubscriber;
 
     private readonly ConcurrentDictionary<Guid, EventDelegates.OnEntityFireOutputHookEvent> outputHooks = new();
     private readonly ConcurrentDictionary<Guid, EventDelegates.OnEntityIdentityAcceptInputHook> inputHooks = new();
-    private CCSGameRulesImpl cachedGameRules = new(0);
     private volatile bool disposed;
 
     public EntitySystemService( IEventSubscriber eventSubscriber )
@@ -65,8 +66,27 @@ public CHandle<T> GetRefEHandle<T>( T entity ) where T : class, ISchemaClass<T>
     public CCSGameRules? GetGameRules()
     {
         ThrowIfEntitySystemInvalid();
-        cachedGameRules.DangerousSetHandle(NativeEntitySystem.GetGameRules());
-        return cachedGameRules;
+        if (cachedGameRules != null)
+        {
+            if (cachedGameRulesProxy != null && cachedGameRulesProxy.IsValidEntity)
+            {
+                return cachedGameRules;
+            } else
+            {
+                cachedGameRules = null;
+                cachedGameRulesProxy = null;
+                return null;
+            }
+        } else
+        {
+            if (GetAllEntitiesByClass<CCSGameRulesProxy>().FirstOrDefault() is CCSGameRulesProxy proxy)
+            {
+                cachedGameRulesProxy = proxy;
+                cachedGameRules = cachedGameRulesProxy.GameRules;
+                return cachedGameRules;
+            }
+        }
+        return null;
     }
 
     public IEnumerable<CEntityInstance> GetAllEntities()

managed/src/SwiftlyS2.Core/Modules/Events/EventPublisher.cs

@@ -1,6 +1,7 @@
 using System.Runtime.InteropServices;
 using Spectre.Console;
 using SwiftlyS2.Shared.Misc;
+using SwiftlyS2.Shared.Natives;
 using SwiftlyS2.Core.Natives;
 using SwiftlyS2.Shared.Events;
 using SwiftlyS2.Core.Scheduler;
@@ -16,6 +17,7 @@ internal static class EventPublisher
 {
     private static readonly List<EventSubscriber> subscribers = [];
     private static readonly Lock subscribersLock = new();
+    private static CTakeDamageResult emptyTakeDamageResult = new();
 
     public static void Subscribe( EventSubscriber subscriber )
     {
@@ -637,6 +639,31 @@ public static byte OnEntityTakeDamage( nint entityPtr, nint takeDamageInfoPtr, n
         {
             unsafe
             {
+                if (takeDamageResultPtr == 0 && takeDamageInfoPtr != 0)
+                {
+                    var damageInfo = (CTakeDamageInfo*)takeDamageInfoPtr;
+
+                    emptyTakeDamageResult.OriginatingInfo = damageInfo;
+                    emptyTakeDamageResult.DestructibleHitGroupRequests = damageInfo->DestructiblePartDamageRequests;
+                    emptyTakeDamageResult.HealthLost = (int)damageInfo->Damage;
+                    emptyTakeDamageResult.DamageDealt = damageInfo->Damage;
+                    emptyTakeDamageResult.PreModifiedDamage = damageInfo->Damage;
+                    emptyTakeDamageResult.TotalledDamageDealt = damageInfo->Damage;
+                    emptyTakeDamageResult.TotalledHealthLost = (int)damageInfo->Damage;
+                    emptyTakeDamageResult.TotalledPreModifiedDamage = damageInfo->Damage;
+                    emptyTakeDamageResult.DamageFlags = damageInfo->DamageFlags;
+                    emptyTakeDamageResult.WasDamageSuppressed = (byte)(damageInfo->InTakeDamageFlow == 0 ? 1 : 0);
+                    emptyTakeDamageResult.OverrideFlinchHitGroup = damageInfo->ActualHitGroup;
+                    emptyTakeDamageResult.HealthBefore = 0;
+                    emptyTakeDamageResult.NewDamageAccumulatorValue = 0;
+                    emptyTakeDamageResult.SuppressFlinch = 0;
+
+                    fixed (CTakeDamageResult* resultPtr = &emptyTakeDamageResult)
+                    {
+                        takeDamageResultPtr = (nint)resultPtr;
+                    }
+                }
+
                 OnEntityTakeDamageEvent @event = new() {
                     Entity = EntityManager.GetEntityByAddress(entityPtr) ?? new CEntityInstanceImpl(entityPtr),
                     _infoPtr = takeDamageInfoPtr,