Initial update after 2024-05-23 CS2 update (#461 )

chore(deps): bump libraries/hl2sdk-cs2 from f7ed6a0 to 36dd2db (#452 )
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: roflmuffin <shortguy014@gmail.com>
2025-12-08 00:46:34 -08:00 · 2024-05-25 18:50:09 +10:00 · 2024-05-10 11:50:41 +10:00 · 2024-05-09 00:43:54 +10:00 · 2024-05-08 20:13:19 +10:00 · 2024-05-08 20:10:01 +10:00
99 changed files with 3014 additions and 2769 deletions
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -5,7 +5,8 @@ updates:
    directory: "/"
    allow:
      - dependency-name: "libraries/hl2sdk-cs2"
+      - dependency-name: "libraries/metamod-source"
    schedule:
      interval: "daily"
    commit-message:
-      prefix: "chore(deps): update hl2sdk"
+      prefix: "chore(deps)"
--- a/configs/addons/counterstrikesharp/gamedata/gamedata.json
+++ b/configs/addons/counterstrikesharp/gamedata/gamedata.json
@@ -22,21 +22,21 @@
  },
  "CCSPlayerController_ChangeTeam": {
    "offsets": {
-      "windows": 93,
-      "linux": 92
+      "windows": 98,
+      "linux": 97
    }
  },
  "CCSPlayerController_Respawn": {
    "offsets": {
-      "windows": 244,
-      "linux": 246
+      "windows": 254,
+      "linux": 256
    }
  },
  "CBasePlayerController_SetPawn": {
    "signatures": {
      "library": "server",
-      "windows": "44 88 4C 24 20 55 57 41 54 41 56 41 57 48 8D 6C 24 ? 48 81 EC ?",
-      "linux": "55 48 89 E5 41 57 41 56 41 55 41 54 49 89 FC 53 48 89 F3 48 81 EC C8 00 00 00"
+      "windows": "44 88 4C 24 ? 55 56 57 41 54 41 56 48 8D 6C 24 ?",
+      "linux": "55 48 89 E5 41 57 41 56 41 89 D6 41 55 49 89 FD 41 54 45 89 C4"
    }
  },
  "CCSPlayerPawnBase_PostThink": {
@@ -46,11 +46,18 @@
      "linux": "55 48 89 E5 41 56 41 55 41 54 53 48 89 FB 48 83 EC 30 E8 ? ? ? ?"
    }
  },
+  "CGameEventManager_Init": {
+    "signatures": {
+      "library": "server",
+      "windows": "40 53 48 83 EC 20 48 8B 01 48 8B D9 FF 50 10",
+      "linux": "55 48 89 E5 41 54 49 89 FC 48 83 EC 08 48 8B 07 FF 50 18"
+    }
+  },
  "GiveNamedItem": {
    "signatures": {
      "library": "server",
      "windows": "48 89 5C 24 ? 48 89 74 24 ? 55 57 41 ? 41 ? 41 ? 48 ? ? ? ? 48 ? ? ? ? ? ? 4D ? ? 48",
-      "linux": "55 48 89 E5 41 57 41 56 49 89 D6 41 55 49 89 FD 41 54 48"
+      "linux": "55 48 89 E5 41 57 41 56 45 31 F6 41 55 49 89 CD"
    }
  },
  "UTIL_Remove": {
@@ -64,7 +71,7 @@
    "signatures": {
      "library": "server",
      "windows": "44 89 4C 24 20 44 88 44 24 18",
-      "linux": "55 48 89 E5 41 57 49 89 FF 41 56 41 55 41 54 4D 89 C4"
+      "linux": "55 48 89 E5 41 57 41 56 41 89 D6 41 55 4D 89 C5"
    }
  },
  "CBaseModelEntity_SetModel": {
@@ -108,8 +115,8 @@
  "CCSGameRules_TerminateRound": {
    "signatures": {
      "library": "server",
-      "windows": "48 ? ? 4C 89 48 ? 48 89 48 ? 55 41",
-      "linux": "55 48 89 E5 41 57 41 56 41 55 41 54 49 89 FC 53 48 81 EC E8 01 00 00 48 8D 05 ? ? ? ?"
+      "windows": "48 8B C4 4C 89 48 ? 48 89 48 ? 55 56",
+      "linux": "55 48 89 E5 41 57 41 56 41 55 41 54 49 89 FC 53 48 81 EC 88 00 00 00 48 8D 05 ? ? ? ?"
    }
  },
  "UTIL_CreateEntityByName": {
@@ -144,13 +151,13 @@
    "signatures": {
      "library": "server",
      "windows": "48 8B 15 ? ? ? ? 48 85 D2 74 ? 85 C9 74",
-      "linux": "48 8B 05 ? ? ? ? 48 85 C0 74 ? 83 FF 3F 76 ? 31 C0"
+      "linux": "48 8B 05 ? ? ? ? 48 85 C0 74 ? 85 FF"
    }
  },
  "CBasePlayerPawn_CommitSuicide": {
    "offsets": {
-      "windows": 360,
-      "linux": 360
+      "windows": 372,
+      "linux": 372
    }
  },
  "CBasePlayerPawn_RemovePlayerItem": {
@@ -162,15 +169,15 @@
  },
  "CBaseEntity_Teleport": {
    "offsets": {
-      "windows": 149,
-      "linux": 148
+      "windows": 155,
+      "linux": 154
    }
  },
  "CBaseEntity_TakeDamageOld": {
    "signatures": {
      "library": "server",
-      "windows": "40 56 57 48 83 EC 58 48 8B 41 10",
-      "linux": "55 48 89 E5 41 57 41 56 41 55 41 54 49 89 FC 53 48 83 EC 38 4C 8D 2D ? ? ? ? 49 8B 7D 00 48 85 FF 0F 84 ? ? ? ?"
+      "windows": "48 89 74 24 20 57 48 83 EC 60 48 8B 41 10",
+      "linux": "55 48 89 E5 41 57 41 56 41 55 41 54 49 89 FC 53 48 83 EC 48 4C 8D 2D ? ? ? ? 49 8B 7D 00 48 85 FF 0F 84 ? ? ? ?"
    }
  },
  "CBaseTrigger_StartTouch": {
--- a/libraries/hl2sdk-cs2
+++ b/libraries/hl2sdk-cs2
--- a/libraries/metamod-source
+++ b/libraries/metamod-source
--- a/managed/CounterStrikeSharp.API/Core/GameEvents.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/GameEvents.g.cs
@@ -937,6 +937,22 @@ namespace CounterStrikeSharp.API.Core
                }
            }

+            [EventName("clientside_reload_custom_econ")]
+            public class EventClientsideReloadCustomEcon : GameEvent
+            {
+                public EventClientsideReloadCustomEcon(IntPtr pointer) : base(pointer){}
+                public EventClientsideReloadCustomEcon(bool force) : base("clientside_reload_custom_econ", force){}
+
+                
+
+                
+                public string Steamid
+                {
+                    get => Get<string>("steamid");
+                    set => Set<string>("steamid", value);
+                }
+            }
+
            [EventName("cs_game_disconnected")]
            public class EventCsGameDisconnected : GameEvent
            {
@@ -3728,54 +3744,6 @@ namespace CounterStrikeSharp.API.Core
                
            }

-            [EventName("items_gifted")]
-            public class EventItemsGifted : GameEvent
-            {
-                public EventItemsGifted(IntPtr pointer) : base(pointer){}
-                public EventItemsGifted(bool force) : base("items_gifted", force){}
-
-                
-
-                // entity used by player
-                public CCSPlayerController? Player
-                {
-                    get => GetPlayer("player");
-                    set => SetPlayer("player", value);
-                }
-
-
-                
-                public long Itemdef
-                {
-                    get => Get<long>("itemdef");
-                    set => Set<long>("itemdef", value);
-                }
-
-
-                
-                public int Numgifts
-                {
-                    get => Get<int>("numgifts");
-                    set => Set<int>("numgifts", value);
-                }
-
-
-                
-                public long Giftidx
-                {
-                    get => Get<long>("giftidx");
-                    set => Set<long>("giftidx", value);
-                }
-
-
-                
-                public long Accountid
-                {
-                    get => Get<long>("accountid");
-                    set => Set<long>("accountid", value);
-                }
-            }
-
            [EventName("jointeam_failed")]
            public class EventJointeamFailed : GameEvent
            {
@@ -6578,15 +6546,6 @@ namespace CounterStrikeSharp.API.Core
                }
            }

-            [EventName("tr_exit_hint_trigger")]
-            public class EventTrExitHintTrigger : GameEvent
-            {
-                public EventTrExitHintTrigger(IntPtr pointer) : base(pointer){}
-                public EventTrExitHintTrigger(bool force) : base("tr_exit_hint_trigger", force){}
-
-                
-            }
-
            [EventName("trial_time_expired")]
            public class EventTrialTimeExpired : GameEvent
            {
@@ -6603,72 +6562,6 @@ namespace CounterStrikeSharp.API.Core
                }
            }

-            [EventName("tr_mark_best_time")]
-            public class EventTrMarkBestTime : GameEvent
-            {
-                public EventTrMarkBestTime(IntPtr pointer) : base(pointer){}
-                public EventTrMarkBestTime(bool force) : base("tr_mark_best_time", force){}
-
-                
-
-                
-                public long Time
-                {
-                    get => Get<long>("time");
-                    set => Set<long>("time", value);
-                }
-            }
-
-            [EventName("tr_mark_complete")]
-            public class EventTrMarkComplete : GameEvent
-            {
-                public EventTrMarkComplete(IntPtr pointer) : base(pointer){}
-                public EventTrMarkComplete(bool force) : base("tr_mark_complete", force){}
-
-                
-
-                
-                public int Complete
-                {
-                    get => Get<int>("complete");
-                    set => Set<int>("complete", value);
-                }
-            }
-
-            [EventName("tr_player_flashbanged")]
-            public class EventTrPlayerFlashbanged : GameEvent
-            {
-                public EventTrPlayerFlashbanged(IntPtr pointer) : base(pointer){}
-                public EventTrPlayerFlashbanged(bool force) : base("tr_player_flashbanged", force){}
-
-                
-
-                // user ID of the player banged
-                public CCSPlayerController? Userid
-                {
-                    get => GetPlayer("userid");
-                    set => SetPlayer("userid", value);
-                }
-            }
-
-            [EventName("tr_show_exit_msgbox")]
-            public class EventTrShowExitMsgbox : GameEvent
-            {
-                public EventTrShowExitMsgbox(IntPtr pointer) : base(pointer){}
-                public EventTrShowExitMsgbox(bool force) : base("tr_show_exit_msgbox", force){}
-
-                
-            }
-
-            [EventName("tr_show_finish_msgbox")]
-            public class EventTrShowFinishMsgbox : GameEvent
-            {
-                public EventTrShowFinishMsgbox(IntPtr pointer) : base(pointer){}
-                public EventTrShowFinishMsgbox(bool force) : base("tr_show_finish_msgbox", force){}
-
-                
-            }
-
            [EventName("ugc_file_download_finished")]
            public class EventUgcFileDownloadFinished : GameEvent
            {
@@ -7225,22 +7118,6 @@ namespace CounterStrikeSharp.API.Core
                }
            }

-            [EventName("weapon_outofammo")]
-            public class EventWeaponOutofammo : GameEvent
-            {
-                public EventWeaponOutofammo(IntPtr pointer) : base(pointer){}
-                public EventWeaponOutofammo(bool force) : base("weapon_outofammo", force){}
-
-                
-
-                
-                public CCSPlayerController? Userid
-                {
-                    get => GetPlayer("userid");
-                    set => SetPlayer("userid", value);
-                }
-            }
-
            [EventName("weapon_reload")]
            public class EventWeaponReload : GameEvent
            {
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CAISound.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CAISound.g.cs
@@ -20,11 +20,11 @@ public partial class CAISound : CPointEntity

 	// m_iSoundType
 	[SchemaMember("CAISound", "m_iSoundType")]
-	public ref Int32 SoundType => ref Schema.GetRef<Int32>(this.Handle, "CAISound", "m_iSoundType");
+	public ref SoundTypes_t SoundType => ref Schema.GetRef<SoundTypes_t>(this.Handle, "CAISound", "m_iSoundType");

-	// m_iSoundContext
-	[SchemaMember("CAISound", "m_iSoundContext")]
-	public ref Int32 SoundContext => ref Schema.GetRef<Int32>(this.Handle, "CAISound", "m_iSoundContext");
+	// m_iSoundFlags
+	[SchemaMember("CAISound", "m_iSoundFlags")]
+	public ref SoundFlags_t SoundFlags => ref Schema.GetRef<SoundFlags_t>(this.Handle, "CAISound", "m_iSoundFlags");

 	// m_iVolume
 	[SchemaMember("CAISound", "m_iVolume")]
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CAI_Expresser.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CAI_Expresser.g.cs
@@ -46,6 +46,10 @@ public partial class CAI_Expresser : NativeObject
 	[SchemaMember("CAI_Expresser", "m_bConsiderSceneInvolvementAsSpeech")]
 	public ref bool ConsiderSceneInvolvementAsSpeech => ref Schema.GetRef<bool>(this.Handle, "CAI_Expresser", "m_bConsiderSceneInvolvementAsSpeech");

+	// m_bSceneEntityDisabled
+	[SchemaMember("CAI_Expresser", "m_bSceneEntityDisabled")]
+	public ref bool SceneEntityDisabled => ref Schema.GetRef<bool>(this.Handle, "CAI_Expresser", "m_bSceneEntityDisabled");
+
 	// m_nLastSpokenPriority
 	[SchemaMember("CAI_Expresser", "m_nLastSpokenPriority")]
 	public ref Int32 LastSpokenPriority => ref Schema.GetRef<Int32>(this.Handle, "CAI_Expresser", "m_nLastSpokenPriority");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseAnimGraph.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseAnimGraph.g.cs
@@ -54,8 +54,8 @@ public partial class CBaseAnimGraph : CBaseModelEntity
 	[SchemaMember("CBaseAnimGraph", "m_pRagdollPose")]
 	public PhysicsRagdollPose_t? RagdollPose => Schema.GetPointer<PhysicsRagdollPose_t>(this.Handle, "CBaseAnimGraph", "m_pRagdollPose");

-	// m_bClientRagdoll
-	[SchemaMember("CBaseAnimGraph", "m_bClientRagdoll")]
-	public ref bool ClientRagdoll => ref Schema.GetRef<bool>(this.Handle, "CBaseAnimGraph", "m_bClientRagdoll");
+	// m_bRagdollClientSide
+	[SchemaMember("CBaseAnimGraph", "m_bRagdollClientSide")]
+	public ref bool RagdollClientSide => ref Schema.GetRef<bool>(this.Handle, "CBaseAnimGraph", "m_bRagdollClientSide");

 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseAnimGraphController.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseAnimGraphController.g.cs
@@ -30,6 +30,10 @@ public partial class CBaseAnimGraphController : CSkeletonAnimationController
 	[SchemaMember("CBaseAnimGraphController", "m_flSoundSyncTime")]
 	public ref float SoundSyncTime => ref Schema.GetRef<float>(this.Handle, "CBaseAnimGraphController", "m_flSoundSyncTime");

+	// m_nActiveIKChainMask
+	[SchemaMember("CBaseAnimGraphController", "m_nActiveIKChainMask")]
+	public ref UInt32 ActiveIKChainMask => ref Schema.GetRef<UInt32>(this.Handle, "CBaseAnimGraphController", "m_nActiveIKChainMask");
+
 	// m_hSequence
 	[SchemaMember("CBaseAnimGraphController", "m_hSequence")]
 	public ref Int32 Sequence => ref Schema.GetRef<Int32>(this.Handle, "CBaseAnimGraphController", "m_hSequence");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseButton.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseButton.g.cs
@@ -58,6 +58,14 @@ public partial class CBaseButton : CBaseToggle
 		set { Schema.SetString(this.Handle, "CBaseButton", "m_sUnlockedSound", value); }
 	}

+	// m_sOverrideAnticipationName
+	[SchemaMember("CBaseButton", "m_sOverrideAnticipationName")]
+	public string OverrideAnticipationName
+	{
+		get { return Schema.GetUtf8String(this.Handle, "CBaseButton", "m_sOverrideAnticipationName"); }
+		set { Schema.SetString(this.Handle, "CBaseButton", "m_sOverrideAnticipationName", value); }
+	}
+
 	// m_bLocked
 	[SchemaMember("CBaseButton", "m_bLocked")]
 	public ref bool Locked => ref Schema.GetRef<bool>(this.Handle, "CBaseButton", "m_bLocked");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseCSGrenadeProjectile.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseCSGrenadeProjectile.g.cs
@@ -54,10 +54,6 @@ public partial class CBaseCSGrenadeProjectile : CBaseGrenade
 	[SchemaMember("CBaseCSGrenadeProjectile", "m_bDetonationRecorded")]
 	public ref bool DetonationRecorded => ref Schema.GetRef<bool>(this.Handle, "CBaseCSGrenadeProjectile", "m_bDetonationRecorded");

-	// m_flDetonateTime
-	[SchemaMember("CBaseCSGrenadeProjectile", "m_flDetonateTime")]
-	public ref float DetonateTime => ref Schema.GetRef<float>(this.Handle, "CBaseCSGrenadeProjectile", "m_flDetonateTime");
-
 	// m_nItemIndex
 	[SchemaMember("CBaseCSGrenadeProjectile", "m_nItemIndex")]
 	public ref UInt16 ItemIndex => ref Schema.GetRef<UInt16>(this.Handle, "CBaseCSGrenadeProjectile", "m_nItemIndex");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseCombatCharacter.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseCombatCharacter.g.cs
@@ -42,10 +42,6 @@ public partial class CBaseCombatCharacter : CBaseFlex
 	[SchemaMember("CBaseCombatCharacter", "m_bApplyStressDamage")]
 	public ref bool ApplyStressDamage => ref Schema.GetRef<bool>(this.Handle, "CBaseCombatCharacter", "m_bApplyStressDamage");

-	// m_bloodColor
-	[SchemaMember("CBaseCombatCharacter", "m_bloodColor")]
-	public ref Int32 BloodColor => ref Schema.GetRef<Int32>(this.Handle, "CBaseCombatCharacter", "m_bloodColor");
-
 	// m_iDamageCount
 	[SchemaMember("CBaseCombatCharacter", "m_iDamageCount")]
 	public ref Int32 DamageCount => ref Schema.GetRef<Int32>(this.Handle, "CBaseCombatCharacter", "m_iDamageCount");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseEntity.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseEntity.g.cs
@@ -38,9 +38,9 @@ public partial class CBaseEntity : CEntityInstance
 	[SchemaMember("CBaseEntity", "m_nLastThinkTick")]
 	public ref Int32 LastThinkTick => ref Schema.GetRef<Int32>(this.Handle, "CBaseEntity", "m_nLastThinkTick");

-	// m_nDisableContextThinkStartTick
-	[SchemaMember("CBaseEntity", "m_nDisableContextThinkStartTick")]
-	public ref Int32 DisableContextThinkStartTick => ref Schema.GetRef<Int32>(this.Handle, "CBaseEntity", "m_nDisableContextThinkStartTick");
+	// m_bDisabledContextThinks
+	[SchemaMember("CBaseEntity", "m_bDisabledContextThinks")]
+	public ref bool DisabledContextThinks => ref Schema.GetRef<bool>(this.Handle, "CBaseEntity", "m_bDisabledContextThinks");

 	// m_isSteadyState
 	[SchemaMember("CBaseEntity", "m_isSteadyState")]
@@ -250,6 +250,10 @@ public partial class CBaseEntity : CEntityInstance
 	[SchemaMember("CBaseEntity", "m_hGroundEntity")]
 	public CHandle<CBaseEntity> GroundEntity => Schema.GetDeclaredClass<CHandle<CBaseEntity>>(this.Handle, "CBaseEntity", "m_hGroundEntity");

+	// m_nGroundBodyIndex
+	[SchemaMember("CBaseEntity", "m_nGroundBodyIndex")]
+	public ref Int32 GroundBodyIndex => ref Schema.GetRef<Int32>(this.Handle, "CBaseEntity", "m_nGroundBodyIndex");
+
 	// m_flFriction
 	[SchemaMember("CBaseEntity", "m_flFriction")]
 	public ref float Friction => ref Schema.GetRef<float>(this.Handle, "CBaseEntity", "m_flFriction");
@@ -338,4 +342,8 @@ public partial class CBaseEntity : CEntityInstance
 	[SchemaMember("CBaseEntity", "m_flVPhysicsUpdateLocalTime")]
 	public ref float VPhysicsUpdateLocalTime => ref Schema.GetRef<float>(this.Handle, "CBaseEntity", "m_flVPhysicsUpdateLocalTime");

+	// m_nBloodType
+	[SchemaMember("CBaseEntity", "m_nBloodType")]
+	public ref BloodType BloodType => ref Schema.GetRef<BloodType>(this.Handle, "CBaseEntity", "m_nBloodType");
+
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseFlex.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseFlex.g.cs
@@ -40,7 +40,7 @@ public partial class CBaseFlex : CBaseAnimGraph

 	// m_nNextSceneEventId
 	[SchemaMember("CBaseFlex", "m_nNextSceneEventId")]
-	public ref UInt32 NextSceneEventId => ref Schema.GetRef<UInt32>(this.Handle, "CBaseFlex", "m_nNextSceneEventId");
+	public SceneEventId_t NextSceneEventId => Schema.GetDeclaredClass<SceneEventId_t>(this.Handle, "CBaseFlex", "m_nNextSceneEventId");

 	// m_bUpdateLayerPriorities
 	[SchemaMember("CBaseFlex", "m_bUpdateLayerPriorities")]
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBasePlayerController.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBasePlayerController.g.cs
@@ -30,6 +30,10 @@ public partial class CBasePlayerController : CBaseEntity
 	[SchemaMember("CBasePlayerController", "m_hPawn")]
 	public CHandle<CBasePlayerPawn> Pawn => Schema.GetDeclaredClass<CHandle<CBasePlayerPawn>>(this.Handle, "CBasePlayerController", "m_hPawn");

+	// m_bKnownTeamMismatch
+	[SchemaMember("CBasePlayerController", "m_bKnownTeamMismatch")]
+	public ref bool KnownTeamMismatch => ref Schema.GetRef<bool>(this.Handle, "CBasePlayerController", "m_bKnownTeamMismatch");
+
 	// m_nSplitScreenSlot
 	[SchemaMember("CBasePlayerController", "m_nSplitScreenSlot")]
 	public ref Int32 SplitScreenSlot => ref Schema.GetRef<Int32>(this.Handle, "CBasePlayerController", "m_nSplitScreenSlot");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseTrigger.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseTrigger.g.cs
@@ -54,6 +54,10 @@ public partial class CBaseTrigger : CBaseToggle
 	[SchemaMember("CBaseTrigger", "m_OnTouching")]
 	public CEntityIOOutput OnTouching => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CBaseTrigger", "m_OnTouching");

+	// m_OnTouchingEachEntity
+	[SchemaMember("CBaseTrigger", "m_OnTouchingEachEntity")]
+	public CEntityIOOutput OnTouchingEachEntity => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CBaseTrigger", "m_OnTouchingEachEntity");
+
 	// m_OnNotTouching
 	[SchemaMember("CBaseTrigger", "m_OnNotTouching")]
 	public CEntityIOOutput OnNotTouching => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CBaseTrigger", "m_OnNotTouching");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBlood.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBlood.g.cs
@@ -32,6 +32,6 @@ public partial class CBlood : CPointEntity

 	// m_Color
 	[SchemaMember("CBlood", "m_Color")]
-	public ref Int32 Color => ref Schema.GetRef<Int32>(this.Handle, "CBlood", "m_Color");
+	public ref BloodType Color => ref Schema.GetRef<BloodType>(this.Handle, "CBlood", "m_Color");

 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBodyComponentBaseAnimGraph.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBodyComponentBaseAnimGraph.g.cs
@@ -22,8 +22,4 @@ public partial class CBodyComponentBaseAnimGraph : CBodyComponentSkeletonInstanc
 	[SchemaMember("CBodyComponentBaseAnimGraph", "m_animationController")]
 	public CBaseAnimGraphController AnimationController => Schema.GetDeclaredClass<CBaseAnimGraphController>(this.Handle, "CBodyComponentBaseAnimGraph", "m_animationController");

-	// __m_pChainEntity
-	[SchemaMember("CBodyComponentBaseAnimGraph", "__m_pChainEntity")]
-	public CNetworkVarChainer __m_pChainEntity => Schema.GetDeclaredClass<CNetworkVarChainer>(this.Handle, "CBodyComponentBaseAnimGraph", "__m_pChainEntity");
-
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBodyComponentBaseModelEntity.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBodyComponentBaseModelEntity.g.cs
@@ -18,8 +18,4 @@ public partial class CBodyComponentBaseModelEntity : CBodyComponentSkeletonInsta
 {
    public CBodyComponentBaseModelEntity (IntPtr pointer) : base(pointer) {}

-	// __m_pChainEntity
-	[SchemaMember("CBodyComponentBaseModelEntity", "__m_pChainEntity")]
-	public CNetworkVarChainer __m_pChainEntity => Schema.GetDeclaredClass<CNetworkVarChainer>(this.Handle, "CBodyComponentBaseModelEntity", "__m_pChainEntity");
-
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBodyComponentPoint.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBodyComponentPoint.g.cs
@@ -22,8 +22,4 @@ public partial class CBodyComponentPoint : CBodyComponent
 	[SchemaMember("CBodyComponentPoint", "m_sceneNode")]
 	public CGameSceneNode SceneNode => Schema.GetDeclaredClass<CGameSceneNode>(this.Handle, "CBodyComponentPoint", "m_sceneNode");

-	// __m_pChainEntity
-	[SchemaMember("CBodyComponentPoint", "__m_pChainEntity")]
-	public CNetworkVarChainer __m_pChainEntity => Schema.GetDeclaredClass<CNetworkVarChainer>(this.Handle, "CBodyComponentPoint", "__m_pChainEntity");
-
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBodyComponentSkeletonInstance.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBodyComponentSkeletonInstance.g.cs
@@ -22,8 +22,4 @@ public partial class CBodyComponentSkeletonInstance : CBodyComponent
 	[SchemaMember("CBodyComponentSkeletonInstance", "m_skeletonInstance")]
 	public CSkeletonInstance SkeletonInstance => Schema.GetDeclaredClass<CSkeletonInstance>(this.Handle, "CBodyComponentSkeletonInstance", "m_skeletonInstance");

-	// __m_pChainEntity
-	[SchemaMember("CBodyComponentSkeletonInstance", "__m_pChainEntity")]
-	public CNetworkVarChainer __m_pChainEntity => Schema.GetDeclaredClass<CNetworkVarChainer>(this.Handle, "CBodyComponentSkeletonInstance", "__m_pChainEntity");
-
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBreakable.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBreakable.g.cs
@@ -18,6 +18,10 @@ public partial class CBreakable : CBaseModelEntity
 {
    public CBreakable (IntPtr pointer) : base(pointer) {}

+	// m_CPropDataComponent
+	[SchemaMember("CBreakable", "m_CPropDataComponent")]
+	public CPropDataComponent CPropDataComponent => Schema.GetDeclaredClass<CPropDataComponent>(this.Handle, "CBreakable", "m_CPropDataComponent");
+
 	// m_Material
 	[SchemaMember("CBreakable", "m_Material")]
 	public ref Materials Material => ref Schema.GetRef<Materials>(this.Handle, "CBreakable", "m_Material");
@@ -66,42 +70,6 @@ public partial class CBreakable : CBaseModelEntity
 	[SchemaMember("CBreakable", "m_OnBreak")]
 	public CEntityIOOutput OnBreak => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CBreakable", "m_OnBreak");

-	// m_flDmgModBullet
-	[SchemaMember("CBreakable", "m_flDmgModBullet")]
-	public ref float DmgModBullet => ref Schema.GetRef<float>(this.Handle, "CBreakable", "m_flDmgModBullet");
-
-	// m_flDmgModClub
-	[SchemaMember("CBreakable", "m_flDmgModClub")]
-	public ref float DmgModClub => ref Schema.GetRef<float>(this.Handle, "CBreakable", "m_flDmgModClub");
-
-	// m_flDmgModExplosive
-	[SchemaMember("CBreakable", "m_flDmgModExplosive")]
-	public ref float DmgModExplosive => ref Schema.GetRef<float>(this.Handle, "CBreakable", "m_flDmgModExplosive");
-
-	// m_flDmgModFire
-	[SchemaMember("CBreakable", "m_flDmgModFire")]
-	public ref float DmgModFire => ref Schema.GetRef<float>(this.Handle, "CBreakable", "m_flDmgModFire");
-
-	// m_iszPhysicsDamageTableName
-	[SchemaMember("CBreakable", "m_iszPhysicsDamageTableName")]
-	public string PhysicsDamageTableName
-	{
-		get { return Schema.GetUtf8String(this.Handle, "CBreakable", "m_iszPhysicsDamageTableName"); }
-		set { Schema.SetString(this.Handle, "CBreakable", "m_iszPhysicsDamageTableName", value); }
-	}
-
-	// m_iszBasePropData
-	[SchemaMember("CBreakable", "m_iszBasePropData")]
-	public string BasePropData
-	{
-		get { return Schema.GetUtf8String(this.Handle, "CBreakable", "m_iszBasePropData"); }
-		set { Schema.SetString(this.Handle, "CBreakable", "m_iszBasePropData", value); }
-	}
-
-	// m_iInteractions
-	[SchemaMember("CBreakable", "m_iInteractions")]
-	public ref Int32 Interactions => ref Schema.GetRef<Int32>(this.Handle, "CBreakable", "m_iInteractions");
-
 	// m_PerformanceMode
 	[SchemaMember("CBreakable", "m_PerformanceMode")]
 	public ref PerformanceMode_t PerformanceMode => ref Schema.GetRef<PerformanceMode_t>(this.Handle, "CBreakable", "m_PerformanceMode");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBreakableProp.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CBreakableProp.g.cs
@@ -18,6 +18,10 @@ public partial class CBreakableProp : CBaseProp
 {
    public CBreakableProp (IntPtr pointer) : base(pointer) {}

+	// m_CPropDataComponent
+	[SchemaMember("CBreakableProp", "m_CPropDataComponent")]
+	public CPropDataComponent CPropDataComponent => Schema.GetDeclaredClass<CPropDataComponent>(this.Handle, "CBreakableProp", "m_CPropDataComponent");
+
 	// m_OnBreak
 	[SchemaMember("CBreakableProp", "m_OnBreak")]
 	public CEntityIOOutput OnBreak => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CBreakableProp", "m_OnBreak");
@@ -42,6 +46,14 @@ public partial class CBreakableProp : CBaseProp
 	[SchemaMember("CBreakableProp", "m_flPressureDelay")]
 	public ref float PressureDelay => ref Schema.GetRef<float>(this.Handle, "CBreakableProp", "m_flPressureDelay");

+	// m_flDefBurstScale
+	[SchemaMember("CBreakableProp", "m_flDefBurstScale")]
+	public ref float DefBurstScale => ref Schema.GetRef<float>(this.Handle, "CBreakableProp", "m_flDefBurstScale");
+
+	// m_vDefBurstOffset
+	[SchemaMember("CBreakableProp", "m_vDefBurstOffset")]
+	public Vector DefBurstOffset => Schema.GetDeclaredClass<Vector>(this.Handle, "CBreakableProp", "m_vDefBurstOffset");
+
 	// m_hBreaker
 	[SchemaMember("CBreakableProp", "m_hBreaker")]
 	public CHandle<CBaseEntity> Breaker => Schema.GetDeclaredClass<CHandle<CBaseEntity>>(this.Handle, "CBreakableProp", "m_hBreaker");
@@ -50,42 +62,6 @@ public partial class CBreakableProp : CBaseProp
 	[SchemaMember("CBreakableProp", "m_PerformanceMode")]
 	public ref PerformanceMode_t PerformanceMode => ref Schema.GetRef<PerformanceMode_t>(this.Handle, "CBreakableProp", "m_PerformanceMode");

-	// m_flDmgModBullet
-	[SchemaMember("CBreakableProp", "m_flDmgModBullet")]
-	public ref float DmgModBullet => ref Schema.GetRef<float>(this.Handle, "CBreakableProp", "m_flDmgModBullet");
-
-	// m_flDmgModClub
-	[SchemaMember("CBreakableProp", "m_flDmgModClub")]
-	public ref float DmgModClub => ref Schema.GetRef<float>(this.Handle, "CBreakableProp", "m_flDmgModClub");
-
-	// m_flDmgModExplosive
-	[SchemaMember("CBreakableProp", "m_flDmgModExplosive")]
-	public ref float DmgModExplosive => ref Schema.GetRef<float>(this.Handle, "CBreakableProp", "m_flDmgModExplosive");
-
-	// m_flDmgModFire
-	[SchemaMember("CBreakableProp", "m_flDmgModFire")]
-	public ref float DmgModFire => ref Schema.GetRef<float>(this.Handle, "CBreakableProp", "m_flDmgModFire");
-
-	// m_iszPhysicsDamageTableName
-	[SchemaMember("CBreakableProp", "m_iszPhysicsDamageTableName")]
-	public string PhysicsDamageTableName
-	{
-		get { return Schema.GetUtf8String(this.Handle, "CBreakableProp", "m_iszPhysicsDamageTableName"); }
-		set { Schema.SetString(this.Handle, "CBreakableProp", "m_iszPhysicsDamageTableName", value); }
-	}
-
-	// m_iszBasePropData
-	[SchemaMember("CBreakableProp", "m_iszBasePropData")]
-	public string BasePropData
-	{
-		get { return Schema.GetUtf8String(this.Handle, "CBreakableProp", "m_iszBasePropData"); }
-		set { Schema.SetString(this.Handle, "CBreakableProp", "m_iszBasePropData", value); }
-	}
-
-	// m_iInteractions
-	[SchemaMember("CBreakableProp", "m_iInteractions")]
-	public ref Int32 Interactions => ref Schema.GetRef<Int32>(this.Handle, "CBreakableProp", "m_iInteractions");
-
 	// m_flPreventDamageBeforeTime
 	[SchemaMember("CBreakableProp", "m_flPreventDamageBeforeTime")]
 	public ref float PreventDamageBeforeTime => ref Schema.GetRef<float>(this.Handle, "CBreakableProp", "m_flPreventDamageBeforeTime");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSBot.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSBot.g.cs
@@ -18,10 +18,6 @@ public partial class CCSBot : CBot
 {
    public CCSBot (IntPtr pointer) : base(pointer) {}

-	// m_lastCoopSpawnPoint
-	[SchemaMember("CCSBot", "m_lastCoopSpawnPoint")]
-	public CHandle<SpawnPointCoopEnemy> LastCoopSpawnPoint => Schema.GetDeclaredClass<CHandle<SpawnPointCoopEnemy>>(this.Handle, "CCSBot", "m_lastCoopSpawnPoint");
-
 	// m_eyePosition
 	[SchemaMember("CCSBot", "m_eyePosition")]
 	public Vector EyePosition => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSBot", "m_eyePosition");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSGameModeRules_Deathmatch.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSGameModeRules_Deathmatch.g.cs
@@ -26,8 +26,12 @@ public partial class CCSGameModeRules_Deathmatch : CCSGameModeRules
 	[SchemaMember("CCSGameModeRules_Deathmatch", "m_flDMBonusTimeLength")]
 	public ref float DMBonusTimeLength => ref Schema.GetRef<float>(this.Handle, "CCSGameModeRules_Deathmatch", "m_flDMBonusTimeLength");

-	// m_nDMBonusWeaponLoadoutSlot
-	[SchemaMember("CCSGameModeRules_Deathmatch", "m_nDMBonusWeaponLoadoutSlot")]
-	public ref Int16 DMBonusWeaponLoadoutSlot => ref Schema.GetRef<Int16>(this.Handle, "CCSGameModeRules_Deathmatch", "m_nDMBonusWeaponLoadoutSlot");
+	// m_sDMBonusWeapon
+	[SchemaMember("CCSGameModeRules_Deathmatch", "m_sDMBonusWeapon")]
+	public string DMBonusWeapon
+	{
+		get { return Schema.GetUtf8String(this.Handle, "CCSGameModeRules_Deathmatch", "m_sDMBonusWeapon"); }
+		set { Schema.SetString(this.Handle, "CCSGameModeRules_Deathmatch", "m_sDMBonusWeapon", value); }
+	}

 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSGameRules.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSGameRules.g.cs
@@ -18,14 +18,6 @@ public partial class CCSGameRules : CTeamplayRules
 {
    public CCSGameRules (IntPtr pointer) : base(pointer) {}

-	// __m_pChainEntity
-	[SchemaMember("CCSGameRules", "__m_pChainEntity")]
-	public CNetworkVarChainer __m_pChainEntity => Schema.GetDeclaredClass<CNetworkVarChainer>(this.Handle, "CCSGameRules", "__m_pChainEntity");
-
-	// m_coopMissionManager
-	[SchemaMember("CCSGameRules", "m_coopMissionManager")]
-	public CHandle<CBaseEntity> CoopMissionManager => Schema.GetDeclaredClass<CHandle<CBaseEntity>>(this.Handle, "CCSGameRules", "m_coopMissionManager");
-
 	// m_bFreezePeriod
 	[SchemaMember("CCSGameRules", "m_bFreezePeriod")]
 	public ref bool FreezePeriod => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bFreezePeriod");
@@ -42,22 +34,10 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_fWarmupPeriodStart")]
 	public ref float WarmupPeriodStart => ref Schema.GetRef<float>(this.Handle, "CCSGameRules", "m_fWarmupPeriodStart");

-	// m_nTotalPausedTicks
-	[SchemaMember("CCSGameRules", "m_nTotalPausedTicks")]
-	public ref Int32 TotalPausedTicks => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_nTotalPausedTicks");
-
-	// m_nPauseStartTick
-	[SchemaMember("CCSGameRules", "m_nPauseStartTick")]
-	public ref Int32 PauseStartTick => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_nPauseStartTick");
-
 	// m_bServerPaused
 	[SchemaMember("CCSGameRules", "m_bServerPaused")]
 	public ref bool ServerPaused => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bServerPaused");

-	// m_bGamePaused
-	[SchemaMember("CCSGameRules", "m_bGamePaused")]
-	public ref bool GamePaused => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bGamePaused");
-
 	// m_bTerroristTimeOutActive
 	[SchemaMember("CCSGameRules", "m_bTerroristTimeOutActive")]
 	public ref bool TerroristTimeOutActive => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bTerroristTimeOutActive");
@@ -246,46 +226,6 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_bIsHltvActive")]
 	public ref bool IsHltvActive => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bIsHltvActive");

-	// m_nGuardianModeWaveNumber
-	[SchemaMember("CCSGameRules", "m_nGuardianModeWaveNumber")]
-	public ref Int32 GuardianModeWaveNumber => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_nGuardianModeWaveNumber");
-
-	// m_nGuardianModeSpecialKillsRemaining
-	[SchemaMember("CCSGameRules", "m_nGuardianModeSpecialKillsRemaining")]
-	public ref Int32 GuardianModeSpecialKillsRemaining => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_nGuardianModeSpecialKillsRemaining");
-
-	// m_nGuardianModeSpecialWeaponNeeded
-	[SchemaMember("CCSGameRules", "m_nGuardianModeSpecialWeaponNeeded")]
-	public ref Int32 GuardianModeSpecialWeaponNeeded => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_nGuardianModeSpecialWeaponNeeded");
-
-	// m_nGuardianGrenadesToGiveBots
-	[SchemaMember("CCSGameRules", "m_nGuardianGrenadesToGiveBots")]
-	public ref Int32 GuardianGrenadesToGiveBots => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_nGuardianGrenadesToGiveBots");
-
-	// m_nNumHeaviesToSpawn
-	[SchemaMember("CCSGameRules", "m_nNumHeaviesToSpawn")]
-	public ref Int32 NumHeaviesToSpawn => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_nNumHeaviesToSpawn");
-
-	// m_numGlobalGiftsGiven
-	[SchemaMember("CCSGameRules", "m_numGlobalGiftsGiven")]
-	public ref UInt32 NumGlobalGiftsGiven => ref Schema.GetRef<UInt32>(this.Handle, "CCSGameRules", "m_numGlobalGiftsGiven");
-
-	// m_numGlobalGifters
-	[SchemaMember("CCSGameRules", "m_numGlobalGifters")]
-	public ref UInt32 NumGlobalGifters => ref Schema.GetRef<UInt32>(this.Handle, "CCSGameRules", "m_numGlobalGifters");
-
-	// m_numGlobalGiftsPeriodSeconds
-	[SchemaMember("CCSGameRules", "m_numGlobalGiftsPeriodSeconds")]
-	public ref UInt32 NumGlobalGiftsPeriodSeconds => ref Schema.GetRef<UInt32>(this.Handle, "CCSGameRules", "m_numGlobalGiftsPeriodSeconds");
-
-	// m_arrFeaturedGiftersAccounts
-	[SchemaMember("CCSGameRules", "m_arrFeaturedGiftersAccounts")]
-	public Span<UInt32> FeaturedGiftersAccounts => Schema.GetFixedArray<UInt32>(this.Handle, "CCSGameRules", "m_arrFeaturedGiftersAccounts", 4);
-
-	// m_arrFeaturedGiftersGifts
-	[SchemaMember("CCSGameRules", "m_arrFeaturedGiftersGifts")]
-	public Span<UInt32> FeaturedGiftersGifts => Schema.GetFixedArray<UInt32>(this.Handle, "CCSGameRules", "m_arrFeaturedGiftersGifts", 4);
-
 	// m_arrProhibitedItemIndices
 	[SchemaMember("CCSGameRules", "m_arrProhibitedItemIndices")]
 	public Span<UInt16> ProhibitedItemIndices => Schema.GetFixedArray<UInt16>(this.Handle, "CCSGameRules", "m_arrProhibitedItemIndices", 100);
@@ -326,10 +266,6 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_bCTCantBuy")]
 	public ref bool CTCantBuy => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bCTCantBuy");

-	// m_flGuardianBuyUntilTime
-	[SchemaMember("CCSGameRules", "m_flGuardianBuyUntilTime")]
-	public ref float GuardianBuyUntilTime => ref Schema.GetRef<float>(this.Handle, "CCSGameRules", "m_flGuardianBuyUntilTime");
-
 	// m_iMatchStats_RoundResults
 	[SchemaMember("CCSGameRules", "m_iMatchStats_RoundResults")]
 	public Span<Int32> MatchStats_RoundResults => Schema.GetFixedArray<Int32>(this.Handle, "CCSGameRules", "m_iMatchStats_RoundResults", 30);
@@ -366,10 +302,6 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_MinimapVerticalSectionHeights")]
 	public Span<float> MinimapVerticalSectionHeights => Schema.GetFixedArray<float>(this.Handle, "CCSGameRules", "m_MinimapVerticalSectionHeights", 8);

-	// m_bDontIncrementCoopWave
-	[SchemaMember("CCSGameRules", "m_bDontIncrementCoopWave")]
-	public ref bool DontIncrementCoopWave => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bDontIncrementCoopWave");
-
 	// m_bSpawnedTerrorHuntHeavy
 	[SchemaMember("CCSGameRules", "m_bSpawnedTerrorHuntHeavy")]
 	public ref bool SpawnedTerrorHuntHeavy => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bSpawnedTerrorHuntHeavy");
@@ -530,26 +462,6 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_flMatchInfoDecidedTime")]
 	public ref float MatchInfoDecidedTime => ref Schema.GetRef<float>(this.Handle, "CCSGameRules", "m_flMatchInfoDecidedTime");

-	// m_flCoopRespawnAndHealTime
-	[SchemaMember("CCSGameRules", "m_flCoopRespawnAndHealTime")]
-	public ref float CoopRespawnAndHealTime => ref Schema.GetRef<float>(this.Handle, "CCSGameRules", "m_flCoopRespawnAndHealTime");
-
-	// m_coopBonusCoinsFound
-	[SchemaMember("CCSGameRules", "m_coopBonusCoinsFound")]
-	public ref Int32 CoopBonusCoinsFound => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_coopBonusCoinsFound");
-
-	// m_coopBonusPistolsOnly
-	[SchemaMember("CCSGameRules", "m_coopBonusPistolsOnly")]
-	public ref bool CoopBonusPistolsOnly => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_coopBonusPistolsOnly");
-
-	// m_coopPlayersInDeploymentZone
-	[SchemaMember("CCSGameRules", "m_coopPlayersInDeploymentZone")]
-	public ref bool CoopPlayersInDeploymentZone => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_coopPlayersInDeploymentZone");
-
-	// m_coopMissionDeadPlayerRespawnEnabled
-	[SchemaMember("CCSGameRules", "m_coopMissionDeadPlayerRespawnEnabled")]
-	public ref bool CoopMissionDeadPlayerRespawnEnabled => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_coopMissionDeadPlayerRespawnEnabled");
-
 	// mTeamDMLastWinningTeamNumber
 	[SchemaMember("CCSGameRules", "mTeamDMLastWinningTeamNumber")]
 	public ref Int32 MTeamDMLastWinningTeamNumber => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "mTeamDMLastWinningTeamNumber");
@@ -586,10 +498,6 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_iMaxNumCTs")]
 	public ref Int32 MaxNumCTs => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_iMaxNumCTs");

-	// m_iLoserBonus
-	[SchemaMember("CCSGameRules", "m_iLoserBonus")]
-	public ref Int32 LoserBonus => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_iLoserBonus");
-
 	// m_iLoserBonusMostRecentTeam
 	[SchemaMember("CCSGameRules", "m_iLoserBonusMostRecentTeam")]
 	public ref Int32 LoserBonusMostRecentTeam => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_iLoserBonusMostRecentTeam");
@@ -766,10 +674,6 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_bHasTriggeredRoundStartMusic")]
 	public ref bool HasTriggeredRoundStartMusic => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bHasTriggeredRoundStartMusic");

-	// m_bHasTriggeredCoopSpawnReset
-	[SchemaMember("CCSGameRules", "m_bHasTriggeredCoopSpawnReset")]
-	public ref bool HasTriggeredCoopSpawnReset => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bHasTriggeredCoopSpawnReset");
-
 	// m_bSwitchingTeamsAtRoundReset
 	[SchemaMember("CCSGameRules", "m_bSwitchingTeamsAtRoundReset")]
 	public ref bool SwitchingTeamsAtRoundReset => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bSwitchingTeamsAtRoundReset");
@@ -786,14 +690,6 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_RetakeRules")]
 	public CRetakeGameRules RetakeRules => Schema.GetDeclaredClass<CRetakeGameRules>(this.Handle, "CCSGameRules", "m_RetakeRules");

-	// m_GuardianBotSkillLevelMax
-	[SchemaMember("CCSGameRules", "m_GuardianBotSkillLevelMax")]
-	public ref Int32 GuardianBotSkillLevelMax => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_GuardianBotSkillLevelMax");
-
-	// m_GuardianBotSkillLevelMin
-	[SchemaMember("CCSGameRules", "m_GuardianBotSkillLevelMin")]
-	public ref Int32 GuardianBotSkillLevelMin => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_GuardianBotSkillLevelMin");
-
 	// m_arrTeamUniqueKillWeaponsMatch
 	[SchemaMember("CCSGameRules", "m_arrTeamUniqueKillWeaponsMatch")]
 	public Span<NetworkedVector<Int32>> TeamUniqueKillWeaponsMatch => Schema.GetFixedArray<NetworkedVector<Int32>>(this.Handle, "CCSGameRules", "m_arrTeamUniqueKillWeaponsMatch", 4);
@@ -902,8 +798,4 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_flLastPerfSampleTime")]
 	public ref double LastPerfSampleTime => ref Schema.GetRef<double>(this.Handle, "CCSGameRules", "m_flLastPerfSampleTime");

-	// m_bSkipNextServerPerfSample
-	[SchemaMember("CCSGameRules", "m_bSkipNextServerPerfSample")]
-	public ref bool SkipNextServerPerfSample => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bSkipNextServerPerfSample");
-
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSPlayerPawnBase.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSPlayerPawnBase.g.cs
@@ -94,14 +94,6 @@ public partial class CCSPlayerPawnBase : CBasePlayerPawn
 	[SchemaMember("CCSPlayerPawnBase", "m_angEyeAngles")]
 	public QAngle EyeAngles => Schema.GetDeclaredClass<QAngle>(this.Handle, "CCSPlayerPawnBase", "m_angEyeAngles");

-	// m_bHud_MiniScoreHidden
-	[SchemaMember("CCSPlayerPawnBase", "m_bHud_MiniScoreHidden")]
-	public ref bool Hud_MiniScoreHidden => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bHud_MiniScoreHidden");
-
-	// m_bHud_RadarHidden
-	[SchemaMember("CCSPlayerPawnBase", "m_bHud_RadarHidden")]
-	public ref bool Hud_RadarHidden => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bHud_RadarHidden");
-
 	// m_NumEnemiesAtRoundStart
 	[SchemaMember("CCSPlayerPawnBase", "m_NumEnemiesAtRoundStart")]
 	public ref Int32 NumEnemiesAtRoundStart => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_NumEnemiesAtRoundStart");
@@ -110,10 +102,6 @@ public partial class CCSPlayerPawnBase : CBasePlayerPawn
 	[SchemaMember("CCSPlayerPawnBase", "m_wasNotKilledNaturally")]
 	public ref bool WasNotKilledNaturally => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_wasNotKilledNaturally");

-	// m_hPet
-	[SchemaMember("CCSPlayerPawnBase", "m_hPet")]
-	public CHandle<CChicken> Pet => Schema.GetDeclaredClass<CHandle<CChicken>>(this.Handle, "CCSPlayerPawnBase", "m_hPet");
-
 	// m_bCommittingSuicideOnTeamChange
 	[SchemaMember("CCSPlayerPawnBase", "m_bCommittingSuicideOnTeamChange")]
 	public ref bool CommittingSuicideOnTeamChange => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bCommittingSuicideOnTeamChange");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CChicken.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CChicken.g.cs
@@ -22,13 +22,9 @@ public partial class CChicken : CDynamicProp
 	[SchemaMember("CChicken", "m_AttributeManager")]
 	public CAttributeContainer AttributeManager => Schema.GetDeclaredClass<CAttributeContainer>(this.Handle, "CChicken", "m_AttributeManager");

-	// m_OriginalOwnerXuidLow
-	[SchemaMember("CChicken", "m_OriginalOwnerXuidLow")]
-	public ref UInt32 OriginalOwnerXuidLow => ref Schema.GetRef<UInt32>(this.Handle, "CChicken", "m_OriginalOwnerXuidLow");
-
-	// m_OriginalOwnerXuidHigh
-	[SchemaMember("CChicken", "m_OriginalOwnerXuidHigh")]
-	public ref UInt32 OriginalOwnerXuidHigh => ref Schema.GetRef<UInt32>(this.Handle, "CChicken", "m_OriginalOwnerXuidHigh");
+	// m_sActivityFinishedTag
+	[SchemaMember("CChicken", "m_sActivityFinishedTag")]
+	public CUtlStringToken ActivityFinishedTag => Schema.GetDeclaredClass<CUtlStringToken>(this.Handle, "CChicken", "m_sActivityFinishedTag");

 	// m_updateTimer
 	[SchemaMember("CChicken", "m_updateTimer")]
@@ -54,9 +50,13 @@ public partial class CChicken : CDynamicProp
 	[SchemaMember("CChicken", "m_vFallVelocity")]
 	public Vector FallVelocity => Schema.GetDeclaredClass<Vector>(this.Handle, "CChicken", "m_vFallVelocity");

-	// m_activity
-	[SchemaMember("CChicken", "m_activity")]
-	public ref ChickenActivity Activity => ref Schema.GetRef<ChickenActivity>(this.Handle, "CChicken", "m_activity");
+	// m_desiredActivity
+	[SchemaMember("CChicken", "m_desiredActivity")]
+	public ref ChickenActivity DesiredActivity => ref Schema.GetRef<ChickenActivity>(this.Handle, "CChicken", "m_desiredActivity");
+
+	// m_currentActivity
+	[SchemaMember("CChicken", "m_currentActivity")]
+	public ref ChickenActivity CurrentActivity => ref Schema.GetRef<ChickenActivity>(this.Handle, "CChicken", "m_currentActivity");

 	// m_activityTimer
 	[SchemaMember("CChicken", "m_activityTimer")]
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvCombinedLightProbeVolume.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvCombinedLightProbeVolume.g.cs
@@ -18,104 +18,104 @@ public partial class CEnvCombinedLightProbeVolume : CBaseEntity
 {
    public CEnvCombinedLightProbeVolume (IntPtr pointer) : base(pointer) {}

-	// m_Color
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Color")]
-	public Color Color
+	// m_Entity_Color
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_Color")]
+	public Color Entity_Color
 	{
-		get { return Schema.GetCustomMarshalledType<Color>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Color"); }
-		set { Schema.SetCustomMarshalledType<Color>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Color", value); }
+		get { return Schema.GetCustomMarshalledType<Color>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_Color"); }
+		set { Schema.SetCustomMarshalledType<Color>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_Color", value); }
 	}

-	// m_flBrightness
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_flBrightness")]
-	public ref float Brightness => ref Schema.GetRef<float>(this.Handle, "CEnvCombinedLightProbeVolume", "m_flBrightness");
+	// m_Entity_flBrightness
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_flBrightness")]
+	public ref float Entity_flBrightness => ref Schema.GetRef<float>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_flBrightness");

-	// m_hCubemapTexture
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_hCubemapTexture")]
-	public CStrongHandle<InfoForResourceTypeCTextureBase> CubemapTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCombinedLightProbeVolume", "m_hCubemapTexture");
+	// m_Entity_hCubemapTexture
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_hCubemapTexture")]
+	public CStrongHandle<InfoForResourceTypeCTextureBase> Entity_hCubemapTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_hCubemapTexture");

-	// m_bCustomCubemapTexture
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_bCustomCubemapTexture")]
-	public ref bool CustomCubemapTexture => ref Schema.GetRef<bool>(this.Handle, "CEnvCombinedLightProbeVolume", "m_bCustomCubemapTexture");
+	// m_Entity_bCustomCubemapTexture
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_bCustomCubemapTexture")]
+	public ref bool Entity_bCustomCubemapTexture => ref Schema.GetRef<bool>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_bCustomCubemapTexture");

-	// m_hLightProbeTexture
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_hLightProbeTexture")]
-	public CStrongHandle<InfoForResourceTypeCTextureBase> LightProbeTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCombinedLightProbeVolume", "m_hLightProbeTexture");
+	// m_Entity_hLightProbeTexture
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_hLightProbeTexture")]
+	public CStrongHandle<InfoForResourceTypeCTextureBase> Entity_hLightProbeTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_hLightProbeTexture");

-	// m_hLightProbeDirectLightIndicesTexture
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_hLightProbeDirectLightIndicesTexture")]
-	public CStrongHandle<InfoForResourceTypeCTextureBase> LightProbeDirectLightIndicesTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCombinedLightProbeVolume", "m_hLightProbeDirectLightIndicesTexture");
+	// m_Entity_hLightProbeDirectLightIndicesTexture
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_hLightProbeDirectLightIndicesTexture")]
+	public CStrongHandle<InfoForResourceTypeCTextureBase> Entity_hLightProbeDirectLightIndicesTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_hLightProbeDirectLightIndicesTexture");

-	// m_hLightProbeDirectLightScalarsTexture
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_hLightProbeDirectLightScalarsTexture")]
-	public CStrongHandle<InfoForResourceTypeCTextureBase> LightProbeDirectLightScalarsTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCombinedLightProbeVolume", "m_hLightProbeDirectLightScalarsTexture");
+	// m_Entity_hLightProbeDirectLightScalarsTexture
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_hLightProbeDirectLightScalarsTexture")]
+	public CStrongHandle<InfoForResourceTypeCTextureBase> Entity_hLightProbeDirectLightScalarsTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_hLightProbeDirectLightScalarsTexture");

-	// m_hLightProbeDirectLightShadowsTexture
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_hLightProbeDirectLightShadowsTexture")]
-	public CStrongHandle<InfoForResourceTypeCTextureBase> LightProbeDirectLightShadowsTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCombinedLightProbeVolume", "m_hLightProbeDirectLightShadowsTexture");
+	// m_Entity_hLightProbeDirectLightShadowsTexture
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_hLightProbeDirectLightShadowsTexture")]
+	public CStrongHandle<InfoForResourceTypeCTextureBase> Entity_hLightProbeDirectLightShadowsTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_hLightProbeDirectLightShadowsTexture");

-	// m_vBoxMins
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_vBoxMins")]
-	public Vector BoxMins => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCombinedLightProbeVolume", "m_vBoxMins");
+	// m_Entity_vBoxMins
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_vBoxMins")]
+	public Vector Entity_vBoxMins => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_vBoxMins");

-	// m_vBoxMaxs
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_vBoxMaxs")]
-	public Vector BoxMaxs => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCombinedLightProbeVolume", "m_vBoxMaxs");
+	// m_Entity_vBoxMaxs
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_vBoxMaxs")]
+	public Vector Entity_vBoxMaxs => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_vBoxMaxs");

-	// m_bMoveable
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_bMoveable")]
-	public ref bool Moveable => ref Schema.GetRef<bool>(this.Handle, "CEnvCombinedLightProbeVolume", "m_bMoveable");
+	// m_Entity_bMoveable
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_bMoveable")]
+	public ref bool Entity_bMoveable => ref Schema.GetRef<bool>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_bMoveable");

-	// m_nHandshake
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_nHandshake")]
-	public ref Int32 Handshake => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_nHandshake");
+	// m_Entity_nHandshake
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_nHandshake")]
+	public ref Int32 Entity_nHandshake => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_nHandshake");

-	// m_nEnvCubeMapArrayIndex
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_nEnvCubeMapArrayIndex")]
-	public ref Int32 EnvCubeMapArrayIndex => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_nEnvCubeMapArrayIndex");
+	// m_Entity_nEnvCubeMapArrayIndex
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_nEnvCubeMapArrayIndex")]
+	public ref Int32 Entity_nEnvCubeMapArrayIndex => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_nEnvCubeMapArrayIndex");

-	// m_nPriority
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_nPriority")]
-	public ref Int32 Priority => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_nPriority");
+	// m_Entity_nPriority
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_nPriority")]
+	public ref Int32 Entity_nPriority => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_nPriority");

-	// m_bStartDisabled
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_bStartDisabled")]
-	public ref bool StartDisabled => ref Schema.GetRef<bool>(this.Handle, "CEnvCombinedLightProbeVolume", "m_bStartDisabled");
+	// m_Entity_bStartDisabled
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_bStartDisabled")]
+	public ref bool Entity_bStartDisabled => ref Schema.GetRef<bool>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_bStartDisabled");

-	// m_flEdgeFadeDist
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_flEdgeFadeDist")]
-	public ref float EdgeFadeDist => ref Schema.GetRef<float>(this.Handle, "CEnvCombinedLightProbeVolume", "m_flEdgeFadeDist");
+	// m_Entity_flEdgeFadeDist
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_flEdgeFadeDist")]
+	public ref float Entity_flEdgeFadeDist => ref Schema.GetRef<float>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_flEdgeFadeDist");

-	// m_vEdgeFadeDists
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_vEdgeFadeDists")]
-	public Vector EdgeFadeDists => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCombinedLightProbeVolume", "m_vEdgeFadeDists");
+	// m_Entity_vEdgeFadeDists
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_vEdgeFadeDists")]
+	public Vector Entity_vEdgeFadeDists => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_vEdgeFadeDists");

-	// m_nLightProbeSizeX
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_nLightProbeSizeX")]
-	public ref Int32 LightProbeSizeX => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_nLightProbeSizeX");
+	// m_Entity_nLightProbeSizeX
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeSizeX")]
+	public ref Int32 Entity_nLightProbeSizeX => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeSizeX");

-	// m_nLightProbeSizeY
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_nLightProbeSizeY")]
-	public ref Int32 LightProbeSizeY => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_nLightProbeSizeY");
+	// m_Entity_nLightProbeSizeY
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeSizeY")]
+	public ref Int32 Entity_nLightProbeSizeY => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeSizeY");

-	// m_nLightProbeSizeZ
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_nLightProbeSizeZ")]
-	public ref Int32 LightProbeSizeZ => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_nLightProbeSizeZ");
+	// m_Entity_nLightProbeSizeZ
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeSizeZ")]
+	public ref Int32 Entity_nLightProbeSizeZ => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeSizeZ");

-	// m_nLightProbeAtlasX
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_nLightProbeAtlasX")]
-	public ref Int32 LightProbeAtlasX => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_nLightProbeAtlasX");
+	// m_Entity_nLightProbeAtlasX
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeAtlasX")]
+	public ref Int32 Entity_nLightProbeAtlasX => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeAtlasX");

-	// m_nLightProbeAtlasY
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_nLightProbeAtlasY")]
-	public ref Int32 LightProbeAtlasY => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_nLightProbeAtlasY");
+	// m_Entity_nLightProbeAtlasY
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeAtlasY")]
+	public ref Int32 Entity_nLightProbeAtlasY => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeAtlasY");

-	// m_nLightProbeAtlasZ
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_nLightProbeAtlasZ")]
-	public ref Int32 LightProbeAtlasZ => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_nLightProbeAtlasZ");
+	// m_Entity_nLightProbeAtlasZ
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeAtlasZ")]
+	public ref Int32 Entity_nLightProbeAtlasZ => ref Schema.GetRef<Int32>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_nLightProbeAtlasZ");

-	// m_bEnabled
-	[SchemaMember("CEnvCombinedLightProbeVolume", "m_bEnabled")]
-	public ref bool Enabled => ref Schema.GetRef<bool>(this.Handle, "CEnvCombinedLightProbeVolume", "m_bEnabled");
+	// m_Entity_bEnabled
+	[SchemaMember("CEnvCombinedLightProbeVolume", "m_Entity_bEnabled")]
+	public ref bool Entity_bEnabled => ref Schema.GetRef<bool>(this.Handle, "CEnvCombinedLightProbeVolume", "m_Entity_bEnabled");

 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvCubemap.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvCubemap.g.cs
@@ -18,76 +18,76 @@ public partial class CEnvCubemap : CBaseEntity
 {
    public CEnvCubemap (IntPtr pointer) : base(pointer) {}

-	// m_hCubemapTexture
-	[SchemaMember("CEnvCubemap", "m_hCubemapTexture")]
-	public CStrongHandle<InfoForResourceTypeCTextureBase> CubemapTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCubemap", "m_hCubemapTexture");
+	// m_Entity_hCubemapTexture
+	[SchemaMember("CEnvCubemap", "m_Entity_hCubemapTexture")]
+	public CStrongHandle<InfoForResourceTypeCTextureBase> Entity_hCubemapTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvCubemap", "m_Entity_hCubemapTexture");

-	// m_bCustomCubemapTexture
-	[SchemaMember("CEnvCubemap", "m_bCustomCubemapTexture")]
-	public ref bool CustomCubemapTexture => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_bCustomCubemapTexture");
+	// m_Entity_bCustomCubemapTexture
+	[SchemaMember("CEnvCubemap", "m_Entity_bCustomCubemapTexture")]
+	public ref bool Entity_bCustomCubemapTexture => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_Entity_bCustomCubemapTexture");

-	// m_flInfluenceRadius
-	[SchemaMember("CEnvCubemap", "m_flInfluenceRadius")]
-	public ref float InfluenceRadius => ref Schema.GetRef<float>(this.Handle, "CEnvCubemap", "m_flInfluenceRadius");
+	// m_Entity_flInfluenceRadius
+	[SchemaMember("CEnvCubemap", "m_Entity_flInfluenceRadius")]
+	public ref float Entity_flInfluenceRadius => ref Schema.GetRef<float>(this.Handle, "CEnvCubemap", "m_Entity_flInfluenceRadius");

-	// m_vBoxProjectMins
-	[SchemaMember("CEnvCubemap", "m_vBoxProjectMins")]
-	public Vector BoxProjectMins => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCubemap", "m_vBoxProjectMins");
+	// m_Entity_vBoxProjectMins
+	[SchemaMember("CEnvCubemap", "m_Entity_vBoxProjectMins")]
+	public Vector Entity_vBoxProjectMins => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCubemap", "m_Entity_vBoxProjectMins");

-	// m_vBoxProjectMaxs
-	[SchemaMember("CEnvCubemap", "m_vBoxProjectMaxs")]
-	public Vector BoxProjectMaxs => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCubemap", "m_vBoxProjectMaxs");
+	// m_Entity_vBoxProjectMaxs
+	[SchemaMember("CEnvCubemap", "m_Entity_vBoxProjectMaxs")]
+	public Vector Entity_vBoxProjectMaxs => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCubemap", "m_Entity_vBoxProjectMaxs");

-	// m_bMoveable
-	[SchemaMember("CEnvCubemap", "m_bMoveable")]
-	public ref bool Moveable => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_bMoveable");
+	// m_Entity_bMoveable
+	[SchemaMember("CEnvCubemap", "m_Entity_bMoveable")]
+	public ref bool Entity_bMoveable => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_Entity_bMoveable");

-	// m_nHandshake
-	[SchemaMember("CEnvCubemap", "m_nHandshake")]
-	public ref Int32 Handshake => ref Schema.GetRef<Int32>(this.Handle, "CEnvCubemap", "m_nHandshake");
+	// m_Entity_nHandshake
+	[SchemaMember("CEnvCubemap", "m_Entity_nHandshake")]
+	public ref Int32 Entity_nHandshake => ref Schema.GetRef<Int32>(this.Handle, "CEnvCubemap", "m_Entity_nHandshake");

-	// m_nEnvCubeMapArrayIndex
-	[SchemaMember("CEnvCubemap", "m_nEnvCubeMapArrayIndex")]
-	public ref Int32 EnvCubeMapArrayIndex => ref Schema.GetRef<Int32>(this.Handle, "CEnvCubemap", "m_nEnvCubeMapArrayIndex");
+	// m_Entity_nEnvCubeMapArrayIndex
+	[SchemaMember("CEnvCubemap", "m_Entity_nEnvCubeMapArrayIndex")]
+	public ref Int32 Entity_nEnvCubeMapArrayIndex => ref Schema.GetRef<Int32>(this.Handle, "CEnvCubemap", "m_Entity_nEnvCubeMapArrayIndex");

-	// m_nPriority
-	[SchemaMember("CEnvCubemap", "m_nPriority")]
-	public ref Int32 Priority => ref Schema.GetRef<Int32>(this.Handle, "CEnvCubemap", "m_nPriority");
+	// m_Entity_nPriority
+	[SchemaMember("CEnvCubemap", "m_Entity_nPriority")]
+	public ref Int32 Entity_nPriority => ref Schema.GetRef<Int32>(this.Handle, "CEnvCubemap", "m_Entity_nPriority");

-	// m_flEdgeFadeDist
-	[SchemaMember("CEnvCubemap", "m_flEdgeFadeDist")]
-	public ref float EdgeFadeDist => ref Schema.GetRef<float>(this.Handle, "CEnvCubemap", "m_flEdgeFadeDist");
+	// m_Entity_flEdgeFadeDist
+	[SchemaMember("CEnvCubemap", "m_Entity_flEdgeFadeDist")]
+	public ref float Entity_flEdgeFadeDist => ref Schema.GetRef<float>(this.Handle, "CEnvCubemap", "m_Entity_flEdgeFadeDist");

-	// m_vEdgeFadeDists
-	[SchemaMember("CEnvCubemap", "m_vEdgeFadeDists")]
-	public Vector EdgeFadeDists => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCubemap", "m_vEdgeFadeDists");
+	// m_Entity_vEdgeFadeDists
+	[SchemaMember("CEnvCubemap", "m_Entity_vEdgeFadeDists")]
+	public Vector Entity_vEdgeFadeDists => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvCubemap", "m_Entity_vEdgeFadeDists");

-	// m_flDiffuseScale
-	[SchemaMember("CEnvCubemap", "m_flDiffuseScale")]
-	public ref float DiffuseScale => ref Schema.GetRef<float>(this.Handle, "CEnvCubemap", "m_flDiffuseScale");
+	// m_Entity_flDiffuseScale
+	[SchemaMember("CEnvCubemap", "m_Entity_flDiffuseScale")]
+	public ref float Entity_flDiffuseScale => ref Schema.GetRef<float>(this.Handle, "CEnvCubemap", "m_Entity_flDiffuseScale");

-	// m_bStartDisabled
-	[SchemaMember("CEnvCubemap", "m_bStartDisabled")]
-	public ref bool StartDisabled => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_bStartDisabled");
+	// m_Entity_bStartDisabled
+	[SchemaMember("CEnvCubemap", "m_Entity_bStartDisabled")]
+	public ref bool Entity_bStartDisabled => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_Entity_bStartDisabled");

-	// m_bDefaultEnvMap
-	[SchemaMember("CEnvCubemap", "m_bDefaultEnvMap")]
-	public ref bool DefaultEnvMap => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_bDefaultEnvMap");
+	// m_Entity_bDefaultEnvMap
+	[SchemaMember("CEnvCubemap", "m_Entity_bDefaultEnvMap")]
+	public ref bool Entity_bDefaultEnvMap => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_Entity_bDefaultEnvMap");

-	// m_bDefaultSpecEnvMap
-	[SchemaMember("CEnvCubemap", "m_bDefaultSpecEnvMap")]
-	public ref bool DefaultSpecEnvMap => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_bDefaultSpecEnvMap");
+	// m_Entity_bDefaultSpecEnvMap
+	[SchemaMember("CEnvCubemap", "m_Entity_bDefaultSpecEnvMap")]
+	public ref bool Entity_bDefaultSpecEnvMap => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_Entity_bDefaultSpecEnvMap");

-	// m_bIndoorCubeMap
-	[SchemaMember("CEnvCubemap", "m_bIndoorCubeMap")]
-	public ref bool IndoorCubeMap => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_bIndoorCubeMap");
+	// m_Entity_bIndoorCubeMap
+	[SchemaMember("CEnvCubemap", "m_Entity_bIndoorCubeMap")]
+	public ref bool Entity_bIndoorCubeMap => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_Entity_bIndoorCubeMap");

-	// m_bCopyDiffuseFromDefaultCubemap
-	[SchemaMember("CEnvCubemap", "m_bCopyDiffuseFromDefaultCubemap")]
-	public ref bool CopyDiffuseFromDefaultCubemap => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_bCopyDiffuseFromDefaultCubemap");
+	// m_Entity_bCopyDiffuseFromDefaultCubemap
+	[SchemaMember("CEnvCubemap", "m_Entity_bCopyDiffuseFromDefaultCubemap")]
+	public ref bool Entity_bCopyDiffuseFromDefaultCubemap => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_Entity_bCopyDiffuseFromDefaultCubemap");

-	// m_bEnabled
-	[SchemaMember("CEnvCubemap", "m_bEnabled")]
-	public ref bool Enabled => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_bEnabled");
+	// m_Entity_bEnabled
+	[SchemaMember("CEnvCubemap", "m_Entity_bEnabled")]
+	public ref bool Entity_bEnabled => ref Schema.GetRef<bool>(this.Handle, "CEnvCubemap", "m_Entity_bEnabled");

 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvLightProbeVolume.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvLightProbeVolume.g.cs
@@ -18,72 +18,72 @@ public partial class CEnvLightProbeVolume : CBaseEntity
 {
    public CEnvLightProbeVolume (IntPtr pointer) : base(pointer) {}

-	// m_hLightProbeTexture
-	[SchemaMember("CEnvLightProbeVolume", "m_hLightProbeTexture")]
-	public CStrongHandle<InfoForResourceTypeCTextureBase> LightProbeTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvLightProbeVolume", "m_hLightProbeTexture");
+	// m_Entity_hLightProbeTexture
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_hLightProbeTexture")]
+	public CStrongHandle<InfoForResourceTypeCTextureBase> Entity_hLightProbeTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvLightProbeVolume", "m_Entity_hLightProbeTexture");

-	// m_hLightProbeDirectLightIndicesTexture
-	[SchemaMember("CEnvLightProbeVolume", "m_hLightProbeDirectLightIndicesTexture")]
-	public CStrongHandle<InfoForResourceTypeCTextureBase> LightProbeDirectLightIndicesTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvLightProbeVolume", "m_hLightProbeDirectLightIndicesTexture");
+	// m_Entity_hLightProbeDirectLightIndicesTexture
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_hLightProbeDirectLightIndicesTexture")]
+	public CStrongHandle<InfoForResourceTypeCTextureBase> Entity_hLightProbeDirectLightIndicesTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvLightProbeVolume", "m_Entity_hLightProbeDirectLightIndicesTexture");

-	// m_hLightProbeDirectLightScalarsTexture
-	[SchemaMember("CEnvLightProbeVolume", "m_hLightProbeDirectLightScalarsTexture")]
-	public CStrongHandle<InfoForResourceTypeCTextureBase> LightProbeDirectLightScalarsTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvLightProbeVolume", "m_hLightProbeDirectLightScalarsTexture");
+	// m_Entity_hLightProbeDirectLightScalarsTexture
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_hLightProbeDirectLightScalarsTexture")]
+	public CStrongHandle<InfoForResourceTypeCTextureBase> Entity_hLightProbeDirectLightScalarsTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvLightProbeVolume", "m_Entity_hLightProbeDirectLightScalarsTexture");

-	// m_hLightProbeDirectLightShadowsTexture
-	[SchemaMember("CEnvLightProbeVolume", "m_hLightProbeDirectLightShadowsTexture")]
-	public CStrongHandle<InfoForResourceTypeCTextureBase> LightProbeDirectLightShadowsTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvLightProbeVolume", "m_hLightProbeDirectLightShadowsTexture");
+	// m_Entity_hLightProbeDirectLightShadowsTexture
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_hLightProbeDirectLightShadowsTexture")]
+	public CStrongHandle<InfoForResourceTypeCTextureBase> Entity_hLightProbeDirectLightShadowsTexture => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCTextureBase>>(this.Handle, "CEnvLightProbeVolume", "m_Entity_hLightProbeDirectLightShadowsTexture");

-	// m_vBoxMins
-	[SchemaMember("CEnvLightProbeVolume", "m_vBoxMins")]
-	public Vector BoxMins => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvLightProbeVolume", "m_vBoxMins");
+	// m_Entity_vBoxMins
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_vBoxMins")]
+	public Vector Entity_vBoxMins => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvLightProbeVolume", "m_Entity_vBoxMins");

-	// m_vBoxMaxs
-	[SchemaMember("CEnvLightProbeVolume", "m_vBoxMaxs")]
-	public Vector BoxMaxs => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvLightProbeVolume", "m_vBoxMaxs");
+	// m_Entity_vBoxMaxs
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_vBoxMaxs")]
+	public Vector Entity_vBoxMaxs => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvLightProbeVolume", "m_Entity_vBoxMaxs");

-	// m_bMoveable
-	[SchemaMember("CEnvLightProbeVolume", "m_bMoveable")]
-	public ref bool Moveable => ref Schema.GetRef<bool>(this.Handle, "CEnvLightProbeVolume", "m_bMoveable");
+	// m_Entity_bMoveable
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_bMoveable")]
+	public ref bool Entity_bMoveable => ref Schema.GetRef<bool>(this.Handle, "CEnvLightProbeVolume", "m_Entity_bMoveable");

-	// m_nHandshake
-	[SchemaMember("CEnvLightProbeVolume", "m_nHandshake")]
-	public ref Int32 Handshake => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_nHandshake");
+	// m_Entity_nHandshake
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_nHandshake")]
+	public ref Int32 Entity_nHandshake => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_Entity_nHandshake");

-	// m_nPriority
-	[SchemaMember("CEnvLightProbeVolume", "m_nPriority")]
-	public ref Int32 Priority => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_nPriority");
+	// m_Entity_nPriority
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_nPriority")]
+	public ref Int32 Entity_nPriority => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_Entity_nPriority");

-	// m_bStartDisabled
-	[SchemaMember("CEnvLightProbeVolume", "m_bStartDisabled")]
-	public ref bool StartDisabled => ref Schema.GetRef<bool>(this.Handle, "CEnvLightProbeVolume", "m_bStartDisabled");
+	// m_Entity_bStartDisabled
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_bStartDisabled")]
+	public ref bool Entity_bStartDisabled => ref Schema.GetRef<bool>(this.Handle, "CEnvLightProbeVolume", "m_Entity_bStartDisabled");

-	// m_nLightProbeSizeX
-	[SchemaMember("CEnvLightProbeVolume", "m_nLightProbeSizeX")]
-	public ref Int32 LightProbeSizeX => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_nLightProbeSizeX");
+	// m_Entity_nLightProbeSizeX
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_nLightProbeSizeX")]
+	public ref Int32 Entity_nLightProbeSizeX => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_Entity_nLightProbeSizeX");

-	// m_nLightProbeSizeY
-	[SchemaMember("CEnvLightProbeVolume", "m_nLightProbeSizeY")]
-	public ref Int32 LightProbeSizeY => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_nLightProbeSizeY");
+	// m_Entity_nLightProbeSizeY
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_nLightProbeSizeY")]
+	public ref Int32 Entity_nLightProbeSizeY => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_Entity_nLightProbeSizeY");

-	// m_nLightProbeSizeZ
-	[SchemaMember("CEnvLightProbeVolume", "m_nLightProbeSizeZ")]
-	public ref Int32 LightProbeSizeZ => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_nLightProbeSizeZ");
+	// m_Entity_nLightProbeSizeZ
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_nLightProbeSizeZ")]
+	public ref Int32 Entity_nLightProbeSizeZ => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_Entity_nLightProbeSizeZ");

-	// m_nLightProbeAtlasX
-	[SchemaMember("CEnvLightProbeVolume", "m_nLightProbeAtlasX")]
-	public ref Int32 LightProbeAtlasX => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_nLightProbeAtlasX");
+	// m_Entity_nLightProbeAtlasX
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_nLightProbeAtlasX")]
+	public ref Int32 Entity_nLightProbeAtlasX => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_Entity_nLightProbeAtlasX");

-	// m_nLightProbeAtlasY
-	[SchemaMember("CEnvLightProbeVolume", "m_nLightProbeAtlasY")]
-	public ref Int32 LightProbeAtlasY => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_nLightProbeAtlasY");
+	// m_Entity_nLightProbeAtlasY
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_nLightProbeAtlasY")]
+	public ref Int32 Entity_nLightProbeAtlasY => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_Entity_nLightProbeAtlasY");

-	// m_nLightProbeAtlasZ
-	[SchemaMember("CEnvLightProbeVolume", "m_nLightProbeAtlasZ")]
-	public ref Int32 LightProbeAtlasZ => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_nLightProbeAtlasZ");
+	// m_Entity_nLightProbeAtlasZ
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_nLightProbeAtlasZ")]
+	public ref Int32 Entity_nLightProbeAtlasZ => ref Schema.GetRef<Int32>(this.Handle, "CEnvLightProbeVolume", "m_Entity_nLightProbeAtlasZ");

-	// m_bEnabled
-	[SchemaMember("CEnvLightProbeVolume", "m_bEnabled")]
-	public ref bool Enabled => ref Schema.GetRef<bool>(this.Handle, "CEnvLightProbeVolume", "m_bEnabled");
+	// m_Entity_bEnabled
+	[SchemaMember("CEnvLightProbeVolume", "m_Entity_bEnabled")]
+	public ref bool Entity_bEnabled => ref Schema.GetRef<bool>(this.Handle, "CEnvLightProbeVolume", "m_Entity_bEnabled");

 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvMicrophone.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvMicrophone.g.cs
@@ -26,9 +26,13 @@ public partial class CEnvMicrophone : CPointEntity
 	[SchemaMember("CEnvMicrophone", "m_hMeasureTarget")]
 	public CHandle<CBaseEntity> MeasureTarget => Schema.GetDeclaredClass<CHandle<CBaseEntity>>(this.Handle, "CEnvMicrophone", "m_hMeasureTarget");

-	// m_nSoundMask
-	[SchemaMember("CEnvMicrophone", "m_nSoundMask")]
-	public ref Int32 SoundMask => ref Schema.GetRef<Int32>(this.Handle, "CEnvMicrophone", "m_nSoundMask");
+	// m_nSoundType
+	[SchemaMember("CEnvMicrophone", "m_nSoundType")]
+	public ref SoundTypes_t SoundType => ref Schema.GetRef<SoundTypes_t>(this.Handle, "CEnvMicrophone", "m_nSoundType");
+
+	// m_nSoundFlags
+	[SchemaMember("CEnvMicrophone", "m_nSoundFlags")]
+	public ref SoundFlags_t SoundFlags => ref Schema.GetRef<SoundFlags_t>(this.Handle, "CEnvMicrophone", "m_nSoundFlags");

 	// m_flSensitivity
 	[SchemaMember("CEnvMicrophone", "m_flSensitivity")]
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvVolumetricFogController.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvVolumetricFogController.g.cs
@@ -114,6 +114,10 @@ public partial class CEnvVolumetricFogController : CBaseEntity
 	[SchemaMember("CEnvVolumetricFogController", "m_bEnableIndirect")]
 	public ref bool EnableIndirect => ref Schema.GetRef<bool>(this.Handle, "CEnvVolumetricFogController", "m_bEnableIndirect");

+	// m_bIndirectUseLPVs
+	[SchemaMember("CEnvVolumetricFogController", "m_bIndirectUseLPVs")]
+	public ref bool IndirectUseLPVs => ref Schema.GetRef<bool>(this.Handle, "CEnvVolumetricFogController", "m_bIndirectUseLPVs");
+
 	// m_bIsMaster
 	[SchemaMember("CEnvVolumetricFogController", "m_bIsMaster")]
 	public ref bool IsMaster => ref Schema.GetRef<bool>(this.Handle, "CEnvVolumetricFogController", "m_bIsMaster");
@@ -126,6 +130,18 @@ public partial class CEnvVolumetricFogController : CBaseEntity
 	[SchemaMember("CEnvVolumetricFogController", "m_nForceRefreshCount")]
 	public ref Int32 ForceRefreshCount => ref Schema.GetRef<Int32>(this.Handle, "CEnvVolumetricFogController", "m_nForceRefreshCount");

+	// m_fNoiseSpeed
+	[SchemaMember("CEnvVolumetricFogController", "m_fNoiseSpeed")]
+	public ref float NoiseSpeed => ref Schema.GetRef<float>(this.Handle, "CEnvVolumetricFogController", "m_fNoiseSpeed");
+
+	// m_fNoiseStrength
+	[SchemaMember("CEnvVolumetricFogController", "m_fNoiseStrength")]
+	public ref float NoiseStrength => ref Schema.GetRef<float>(this.Handle, "CEnvVolumetricFogController", "m_fNoiseStrength");
+
+	// m_vNoiseScale
+	[SchemaMember("CEnvVolumetricFogController", "m_vNoiseScale")]
+	public Vector NoiseScale => Schema.GetDeclaredClass<Vector>(this.Handle, "CEnvVolumetricFogController", "m_vNoiseScale");
+
 	// m_bFirstTime
 	[SchemaMember("CEnvVolumetricFogController", "m_bFirstTime")]
 	public ref bool FirstTime => ref Schema.GetRef<bool>(this.Handle, "CEnvVolumetricFogController", "m_bFirstTime");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvVolumetricFogVolume.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CEnvVolumetricFogVolume.g.cs
@@ -46,4 +46,36 @@ public partial class CEnvVolumetricFogVolume : CBaseEntity
 	[SchemaMember("CEnvVolumetricFogVolume", "m_flFalloffExponent")]
 	public ref float FalloffExponent => ref Schema.GetRef<float>(this.Handle, "CEnvVolumetricFogVolume", "m_flFalloffExponent");

+	// m_flHeightFogDepth
+	[SchemaMember("CEnvVolumetricFogVolume", "m_flHeightFogDepth")]
+	public ref float HeightFogDepth => ref Schema.GetRef<float>(this.Handle, "CEnvVolumetricFogVolume", "m_flHeightFogDepth");
+
+	// m_fHeightFogEdgeWidth
+	[SchemaMember("CEnvVolumetricFogVolume", "m_fHeightFogEdgeWidth")]
+	public ref float HeightFogEdgeWidth => ref Schema.GetRef<float>(this.Handle, "CEnvVolumetricFogVolume", "m_fHeightFogEdgeWidth");
+
+	// m_fIndirectLightStrength
+	[SchemaMember("CEnvVolumetricFogVolume", "m_fIndirectLightStrength")]
+	public ref float IndirectLightStrength => ref Schema.GetRef<float>(this.Handle, "CEnvVolumetricFogVolume", "m_fIndirectLightStrength");
+
+	// m_fSunLightStrength
+	[SchemaMember("CEnvVolumetricFogVolume", "m_fSunLightStrength")]
+	public ref float SunLightStrength => ref Schema.GetRef<float>(this.Handle, "CEnvVolumetricFogVolume", "m_fSunLightStrength");
+
+	// m_fNoiseStrength
+	[SchemaMember("CEnvVolumetricFogVolume", "m_fNoiseStrength")]
+	public ref float NoiseStrength => ref Schema.GetRef<float>(this.Handle, "CEnvVolumetricFogVolume", "m_fNoiseStrength");
+
+	// m_bOverrideIndirectLightStrength
+	[SchemaMember("CEnvVolumetricFogVolume", "m_bOverrideIndirectLightStrength")]
+	public ref bool OverrideIndirectLightStrength => ref Schema.GetRef<bool>(this.Handle, "CEnvVolumetricFogVolume", "m_bOverrideIndirectLightStrength");
+
+	// m_bOverrideSunLightStrength
+	[SchemaMember("CEnvVolumetricFogVolume", "m_bOverrideSunLightStrength")]
+	public ref bool OverrideSunLightStrength => ref Schema.GetRef<bool>(this.Handle, "CEnvVolumetricFogVolume", "m_bOverrideSunLightStrength");
+
+	// m_bOverrideNoiseStrength
+	[SchemaMember("CEnvVolumetricFogVolume", "m_bOverrideNoiseStrength")]
+	public ref bool OverrideNoiseStrength => ref Schema.GetRef<bool>(this.Handle, "CEnvVolumetricFogVolume", "m_bOverrideNoiseStrength");
+
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CFuncMoveLinear.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CFuncMoveLinear.g.cs
@@ -62,10 +62,6 @@ public partial class CFuncMoveLinear : CBaseToggle
 	[SchemaMember("CFuncMoveLinear", "m_flStartPosition")]
 	public ref float StartPosition => ref Schema.GetRef<float>(this.Handle, "CFuncMoveLinear", "m_flStartPosition");

-	// m_flMoveDistance
-	[SchemaMember("CFuncMoveLinear", "m_flMoveDistance")]
-	public ref float MoveDistance => ref Schema.GetRef<float>(this.Handle, "CFuncMoveLinear", "m_flMoveDistance");
-
 	// m_OnFullyOpen
 	[SchemaMember("CFuncMoveLinear", "m_OnFullyOpen")]
 	public CEntityIOOutput OnFullyOpen => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CFuncMoveLinear", "m_OnFullyOpen");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CFuncRotating.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CFuncRotating.g.cs
@@ -58,10 +58,6 @@ public partial class CFuncRotating : CBaseModelEntity
 	[SchemaMember("CFuncRotating", "m_flBlockDamage")]
 	public ref float BlockDamage => ref Schema.GetRef<float>(this.Handle, "CFuncRotating", "m_flBlockDamage");

-	// m_flTimeScale
-	[SchemaMember("CFuncRotating", "m_flTimeScale")]
-	public ref float TimeScale => ref Schema.GetRef<float>(this.Handle, "CFuncRotating", "m_flTimeScale");
-
 	// m_NoiseRunning
 	[SchemaMember("CFuncRotating", "m_NoiseRunning")]
 	public string NoiseRunning
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CFuncTrackTrain.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CFuncTrackTrain.g.cs
@@ -182,10 +182,6 @@ public partial class CFuncTrackTrain : CBaseModelEntity
 	[SchemaMember("CFuncTrackTrain", "m_bAccelToSpeed")]
 	public ref bool AccelToSpeed => ref Schema.GetRef<bool>(this.Handle, "CFuncTrackTrain", "m_bAccelToSpeed");

-	// m_flTimeScale
-	[SchemaMember("CFuncTrackTrain", "m_flTimeScale")]
-	public ref float TimeScale => ref Schema.GetRef<float>(this.Handle, "CFuncTrackTrain", "m_flTimeScale");
-
 	// m_flNextMPSoundTime
 	[SchemaMember("CFuncTrackTrain", "m_flNextMPSoundTime")]
 	public ref float NextMPSoundTime => ref Schema.GetRef<float>(this.Handle, "CFuncTrackTrain", "m_flNextMPSoundTime");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CGameRules.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CGameRules.g.cs
@@ -18,6 +18,10 @@ public partial class CGameRules : NativeObject
 {
    public CGameRules (IntPtr pointer) : base(pointer) {}

+	// __m_pChainEntity
+	[SchemaMember("CGameRules", "__m_pChainEntity")]
+	public CNetworkVarChainer __m_pChainEntity => Schema.GetDeclaredClass<CNetworkVarChainer>(this.Handle, "CGameRules", "__m_pChainEntity");
+
 	// m_szQuestName
 	[SchemaMember("CGameRules", "m_szQuestName")]
 	public string QuestName
@@ -30,4 +34,16 @@ public partial class CGameRules : NativeObject
 	[SchemaMember("CGameRules", "m_nQuestPhase")]
 	public ref Int32 QuestPhase => ref Schema.GetRef<Int32>(this.Handle, "CGameRules", "m_nQuestPhase");

+	// m_nTotalPausedTicks
+	[SchemaMember("CGameRules", "m_nTotalPausedTicks")]
+	public ref Int32 TotalPausedTicks => ref Schema.GetRef<Int32>(this.Handle, "CGameRules", "m_nTotalPausedTicks");
+
+	// m_nPauseStartTick
+	[SchemaMember("CGameRules", "m_nPauseStartTick")]
+	public ref Int32 PauseStartTick => ref Schema.GetRef<Int32>(this.Handle, "CGameRules", "m_nPauseStartTick");
+
+	// m_bGamePaused
+	[SchemaMember("CGameRules", "m_bGamePaused")]
+	public ref bool GamePaused => ref Schema.GetRef<bool>(this.Handle, "CGameRules", "m_bGamePaused");
+
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CGameSceneNode.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CGameSceneNode.g.cs
@@ -102,6 +102,10 @@ public partial class CGameSceneNode : NativeObject
 	[SchemaMember("CGameSceneNode", "m_flZOffset")]
 	public ref float ZOffset => ref Schema.GetRef<float>(this.Handle, "CGameSceneNode", "m_flZOffset");

+	// m_flClientLocalScale
+	[SchemaMember("CGameSceneNode", "m_flClientLocalScale")]
+	public ref float ClientLocalScale => ref Schema.GetRef<float>(this.Handle, "CGameSceneNode", "m_flClientLocalScale");
+
 	// m_vRenderOrigin
 	[SchemaMember("CGameSceneNode", "m_vRenderOrigin")]
 	public Vector RenderOrigin => Schema.GetDeclaredClass<Vector>(this.Handle, "CGameSceneNode", "m_vRenderOrigin");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CInfoEnemyTerroristSpawn.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CInfoEnemyTerroristSpawn.g.cs
@@ -1,21 +0,0 @@
-// <auto-generated />
-#nullable enable
-#pragma warning disable CS1591
-
-using System;
-using System.Diagnostics;
-using System.Drawing;
-using CounterStrikeSharp;
-using CounterStrikeSharp.API.Modules.Events;
-using CounterStrikeSharp.API.Modules.Entities;
-using CounterStrikeSharp.API.Modules.Memory;
-using CounterStrikeSharp.API.Modules.Utils;
-using CounterStrikeSharp.API.Core.Attributes;
-
-namespace CounterStrikeSharp.API.Core;
-
-public partial class CInfoEnemyTerroristSpawn : SpawnPointCoopEnemy
-{
-    public CInfoEnemyTerroristSpawn (IntPtr pointer) : base(pointer) {}
-
-}
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CItem.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CItem.g.cs
@@ -22,6 +22,10 @@ public partial class CItem : CBaseAnimGraph
 	[SchemaMember("CItem", "m_OnPlayerTouch")]
 	public CEntityIOOutput OnPlayerTouch => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CItem", "m_OnPlayerTouch");

+	// m_OnPlayerPickup
+	[SchemaMember("CItem", "m_OnPlayerPickup")]
+	public CEntityIOOutput OnPlayerPickup => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CItem", "m_OnPlayerPickup");
+
 	// m_bActivateWhenAtRest
 	[SchemaMember("CItem", "m_bActivateWhenAtRest")]
 	public ref bool ActivateWhenAtRest => ref Schema.GetRef<bool>(this.Handle, "CItem", "m_bActivateWhenAtRest");
@@ -30,10 +34,6 @@ public partial class CItem : CBaseAnimGraph
 	[SchemaMember("CItem", "m_OnCacheInteraction")]
 	public CEntityIOOutput OnCacheInteraction => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CItem", "m_OnCacheInteraction");

-	// m_OnPlayerPickup
-	[SchemaMember("CItem", "m_OnPlayerPickup")]
-	public CEntityIOOutput OnPlayerPickup => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CItem", "m_OnPlayerPickup");
-
 	// m_OnGlovePulled
 	[SchemaMember("CItem", "m_OnGlovePulled")]
 	public CEntityIOOutput OnGlovePulled => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CItem", "m_OnGlovePulled");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CLogicCollisionPair.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CLogicCollisionPair.g.cs
@@ -34,6 +34,10 @@ public partial class CLogicCollisionPair : CLogicalEntity
 		set { Schema.SetString(this.Handle, "CLogicCollisionPair", "m_nameAttach2", value); }
 	}

+	// m_supportMultipleEntitiesWithSameName
+	[SchemaMember("CLogicCollisionPair", "m_supportMultipleEntitiesWithSameName")]
+	public ref bool SupportMultipleEntitiesWithSameName => ref Schema.GetRef<bool>(this.Handle, "CLogicCollisionPair", "m_supportMultipleEntitiesWithSameName");
+
 	// m_disabled
 	[SchemaMember("CLogicCollisionPair", "m_disabled")]
 	public ref bool Disabled => ref Schema.GetRef<bool>(this.Handle, "CLogicCollisionPair", "m_disabled");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CMarkupVolume.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CMarkupVolume.g.cs
@@ -18,8 +18,8 @@ public partial class CMarkupVolume : CBaseModelEntity
 {
    public CMarkupVolume (IntPtr pointer) : base(pointer) {}

-	// m_bEnabled
-	[SchemaMember("CMarkupVolume", "m_bEnabled")]
-	public ref bool Enabled => ref Schema.GetRef<bool>(this.Handle, "CMarkupVolume", "m_bEnabled");
+	// m_bDisabled
+	[SchemaMember("CMarkupVolume", "m_bDisabled")]
+	public ref bool Disabled => ref Schema.GetRef<bool>(this.Handle, "CMarkupVolume", "m_bDisabled");

 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CNavLinkAnimgraphVar.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CNavLinkAnimgraphVar.g.cs
@@ -18,12 +18,12 @@ public partial class CNavLinkAnimgraphVar : NativeObject
 {
    public CNavLinkAnimgraphVar (IntPtr pointer) : base(pointer) {}

-	// m_strAnimgraphVar
-	[SchemaMember("CNavLinkAnimgraphVar", "m_strAnimgraphVar")]
-	public string StrAnimgraphVar
+	// m_sAnimGraphNavlinkType
+	[SchemaMember("CNavLinkAnimgraphVar", "m_sAnimGraphNavlinkType")]
+	public string AnimGraphNavlinkType
 	{
-		get { return Schema.GetUtf8String(this.Handle, "CNavLinkAnimgraphVar", "m_strAnimgraphVar"); }
-		set { Schema.SetString(this.Handle, "CNavLinkAnimgraphVar", "m_strAnimgraphVar", value); }
+		get { return Schema.GetUtf8String(this.Handle, "CNavLinkAnimgraphVar", "m_sAnimGraphNavlinkType"); }
+		set { Schema.SetString(this.Handle, "CNavLinkAnimgraphVar", "m_sAnimGraphNavlinkType", value); }
 	}

 	// m_unAlignmentDegrees
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPathKeyFrame.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPathKeyFrame.g.cs
@@ -50,8 +50,8 @@ public partial class CPathKeyFrame : CLogicalEntity
 	[SchemaMember("CPathKeyFrame", "m_pPrevKey")]
 	public CPathKeyFrame? PrevKey => Schema.GetPointer<CPathKeyFrame>(this.Handle, "CPathKeyFrame", "m_pPrevKey");

-	// m_flSpeed
-	[SchemaMember("CPathKeyFrame", "m_flSpeed")]
-	public ref float Speed => ref Schema.GetRef<float>(this.Handle, "CPathKeyFrame", "m_flSpeed");
+	// m_flMoveSpeed
+	[SchemaMember("CPathKeyFrame", "m_flMoveSpeed")]
+	public ref float MoveSpeed => ref Schema.GetRef<float>(this.Handle, "CPathKeyFrame", "m_flMoveSpeed");

 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CCoopBonusCoin.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CCoopBonusCoin.g.cs
@@ -1,21 +1,29 @@
-// <auto-generated />
-#nullable enable
-#pragma warning disable CS1591
-
-using System;
-using System.Diagnostics;
-using System.Drawing;
-using CounterStrikeSharp;
-using CounterStrikeSharp.API.Modules.Events;
-using CounterStrikeSharp.API.Modules.Entities;
-using CounterStrikeSharp.API.Modules.Memory;
-using CounterStrikeSharp.API.Modules.Utils;
-using CounterStrikeSharp.API.Core.Attributes;
-
-namespace CounterStrikeSharp.API.Core;
-
-public partial class CCoopBonusCoin : CDynamicProp
-{
-    public CCoopBonusCoin (IntPtr pointer) : base(pointer) {}
-
-}
+// <auto-generated />
+#nullable enable
+#pragma warning disable CS1591
+
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using CounterStrikeSharp;
+using CounterStrikeSharp.API.Modules.Events;
+using CounterStrikeSharp.API.Modules.Entities;
+using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Modules.Utils;
+using CounterStrikeSharp.API.Core.Attributes;
+
+namespace CounterStrikeSharp.API.Core;
+
+public partial class CPathSimple : CBaseEntity
+{
+    public CPathSimple (IntPtr pointer) : base(pointer) {}
+
+	// m_pathString
+	[SchemaMember("CPathSimple", "m_pathString")]
+	public string PathString
+	{
+		get { return Schema.GetUtf8String(this.Handle, "CPathSimple", "m_pathString"); }
+		set { Schema.SetString(this.Handle, "CPathSimple", "m_pathString", value); }
+	}
+
+}
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPhysBallSocket.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPhysBallSocket.g.cs
@@ -18,9 +18,9 @@ public partial class CPhysBallSocket : CPhysConstraint
 {
    public CPhysBallSocket (IntPtr pointer) : base(pointer) {}

-	// m_flFriction
-	[SchemaMember("CPhysBallSocket", "m_flFriction")]
-	public ref float Friction => ref Schema.GetRef<float>(this.Handle, "CPhysBallSocket", "m_flFriction");
+	// m_flJointFriction
+	[SchemaMember("CPhysBallSocket", "m_flJointFriction")]
+	public ref float JointFriction => ref Schema.GetRef<float>(this.Handle, "CPhysBallSocket", "m_flJointFriction");

 	// m_bEnableSwingLimit
 	[SchemaMember("CPhysBallSocket", "m_bEnableSwingLimit")]
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPhysConstraint.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPhysConstraint.g.cs
@@ -34,6 +34,30 @@ public partial class CPhysConstraint : CLogicalEntity
 		set { Schema.SetString(this.Handle, "CPhysConstraint", "m_nameAttach2", value); }
 	}

+	// m_hAttach1
+	[SchemaMember("CPhysConstraint", "m_hAttach1")]
+	public CHandle<CBaseEntity> Attach1 => Schema.GetDeclaredClass<CHandle<CBaseEntity>>(this.Handle, "CPhysConstraint", "m_hAttach1");
+
+	// m_hAttach2
+	[SchemaMember("CPhysConstraint", "m_hAttach2")]
+	public CHandle<CBaseEntity> Attach2 => Schema.GetDeclaredClass<CHandle<CBaseEntity>>(this.Handle, "CPhysConstraint", "m_hAttach2");
+
+	// m_nameAttachment1
+	[SchemaMember("CPhysConstraint", "m_nameAttachment1")]
+	public string NameAttachment1
+	{
+		get { return Schema.GetUtf8String(this.Handle, "CPhysConstraint", "m_nameAttachment1"); }
+		set { Schema.SetString(this.Handle, "CPhysConstraint", "m_nameAttachment1", value); }
+	}
+
+	// m_nameAttachment2
+	[SchemaMember("CPhysConstraint", "m_nameAttachment2")]
+	public string NameAttachment2
+	{
+		get { return Schema.GetUtf8String(this.Handle, "CPhysConstraint", "m_nameAttachment2"); }
+		set { Schema.SetString(this.Handle, "CPhysConstraint", "m_nameAttachment2", value); }
+	}
+
 	// m_breakSound
 	[SchemaMember("CPhysConstraint", "m_breakSound")]
 	public string BreakSound
@@ -58,6 +82,10 @@ public partial class CPhysConstraint : CLogicalEntity
 	[SchemaMember("CPhysConstraint", "m_minTeleportDistance")]
 	public ref float MinTeleportDistance => ref Schema.GetRef<float>(this.Handle, "CPhysConstraint", "m_minTeleportDistance");

+	// m_bSnapObjectPositions
+	[SchemaMember("CPhysConstraint", "m_bSnapObjectPositions")]
+	public ref bool SnapObjectPositions => ref Schema.GetRef<bool>(this.Handle, "CPhysConstraint", "m_bSnapObjectPositions");
+
 	// m_OnBreak
 	[SchemaMember("CPhysConstraint", "m_OnBreak")]
 	public CEntityIOOutput OnBreak => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CPhysConstraint", "m_OnBreak");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPhysicsProp.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPhysicsProp.g.cs
@@ -38,13 +38,25 @@ public partial class CPhysicsProp : CBreakableProp
 	[SchemaMember("CPhysicsProp", "m_OnPlayerUse")]
 	public CEntityIOOutput OnPlayerUse => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CPhysicsProp", "m_OnPlayerUse");

+	// m_OnOutOfWorld
+	[SchemaMember("CPhysicsProp", "m_OnOutOfWorld")]
+	public CEntityIOOutput OnOutOfWorld => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CPhysicsProp", "m_OnOutOfWorld");
+
 	// m_OnPlayerPickup
 	[SchemaMember("CPhysicsProp", "m_OnPlayerPickup")]
 	public CEntityIOOutput OnPlayerPickup => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CPhysicsProp", "m_OnPlayerPickup");

-	// m_OnOutOfWorld
-	[SchemaMember("CPhysicsProp", "m_OnOutOfWorld")]
-	public CEntityIOOutput OnOutOfWorld => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CPhysicsProp", "m_OnOutOfWorld");
+	// m_bForceNavIgnore
+	[SchemaMember("CPhysicsProp", "m_bForceNavIgnore")]
+	public ref bool ForceNavIgnore => ref Schema.GetRef<bool>(this.Handle, "CPhysicsProp", "m_bForceNavIgnore");
+
+	// m_bNoNavmeshBlocker
+	[SchemaMember("CPhysicsProp", "m_bNoNavmeshBlocker")]
+	public ref bool NoNavmeshBlocker => ref Schema.GetRef<bool>(this.Handle, "CPhysicsProp", "m_bNoNavmeshBlocker");
+
+	// m_bForceNpcExclude
+	[SchemaMember("CPhysicsProp", "m_bForceNpcExclude")]
+	public ref bool ForceNpcExclude => ref Schema.GetRef<bool>(this.Handle, "CPhysicsProp", "m_bForceNpcExclude");

 	// m_massScale
 	[SchemaMember("CPhysicsProp", "m_massScale")]
@@ -122,18 +134,6 @@ public partial class CPhysicsProp : CBreakableProp
 		set { Schema.SetCustomMarshalledType<Color>(this.Handle, "CPhysicsProp", "m_glowColor", value); }
 	}

-	// m_bForceNavIgnore
-	[SchemaMember("CPhysicsProp", "m_bForceNavIgnore")]
-	public ref bool ForceNavIgnore => ref Schema.GetRef<bool>(this.Handle, "CPhysicsProp", "m_bForceNavIgnore");
-
-	// m_bNoNavmeshBlocker
-	[SchemaMember("CPhysicsProp", "m_bNoNavmeshBlocker")]
-	public ref bool NoNavmeshBlocker => ref Schema.GetRef<bool>(this.Handle, "CPhysicsProp", "m_bNoNavmeshBlocker");
-
-	// m_bForceNpcExclude
-	[SchemaMember("CPhysicsProp", "m_bForceNpcExclude")]
-	public ref bool ForceNpcExclude => ref Schema.GetRef<bool>(this.Handle, "CPhysicsProp", "m_bForceNpcExclude");
-
 	// m_bShouldAutoConvertBackFromDebris
 	[SchemaMember("CPhysicsProp", "m_bShouldAutoConvertBackFromDebris")]
 	public ref bool ShouldAutoConvertBackFromDebris => ref Schema.GetRef<bool>(this.Handle, "CPhysicsProp", "m_bShouldAutoConvertBackFromDebris");
@@ -154,8 +154,4 @@ public partial class CPhysicsProp : CBreakableProp
 	[SchemaMember("CPhysicsProp", "m_bAwake")]
 	public ref bool Awake => ref Schema.GetRef<bool>(this.Handle, "CPhysicsProp", "m_bAwake");

-	// m_nCollisionGroupOverride
-	[SchemaMember("CPhysicsProp", "m_nCollisionGroupOverride")]
-	public ref Int32 CollisionGroupOverride => ref Schema.GetRef<Int32>(this.Handle, "CPhysicsProp", "m_nCollisionGroupOverride");
-
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPointScriptEntity.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPointScriptEntity.g.cs
@@ -1,21 +0,0 @@
-// <auto-generated />
-#nullable enable
-#pragma warning disable CS1591
-
-using System;
-using System.Diagnostics;
-using System.Drawing;
-using CounterStrikeSharp;
-using CounterStrikeSharp.API.Modules.Events;
-using CounterStrikeSharp.API.Modules.Entities;
-using CounterStrikeSharp.API.Modules.Memory;
-using CounterStrikeSharp.API.Modules.Utils;
-using CounterStrikeSharp.API.Core.Attributes;
-
-namespace CounterStrikeSharp.API.Core;
-
-public partial class CPointScriptEntity : CBaseEntity
-{
-    public CPointScriptEntity (IntPtr pointer) : base(pointer) {}
-
-}
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPropDataComponent.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CPropDataComponent.g.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+#nullable enable
+#pragma warning disable CS1591
+
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using CounterStrikeSharp;
+using CounterStrikeSharp.API.Modules.Events;
+using CounterStrikeSharp.API.Modules.Entities;
+using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Modules.Utils;
+using CounterStrikeSharp.API.Core.Attributes;
+
+namespace CounterStrikeSharp.API.Core;
+
+public partial class CPropDataComponent : CEntityComponent
+{
+    public CPropDataComponent (IntPtr pointer) : base(pointer) {}
+
+	// m_flDmgModBullet
+	[SchemaMember("CPropDataComponent", "m_flDmgModBullet")]
+	public ref float DmgModBullet => ref Schema.GetRef<float>(this.Handle, "CPropDataComponent", "m_flDmgModBullet");
+
+	// m_flDmgModClub
+	[SchemaMember("CPropDataComponent", "m_flDmgModClub")]
+	public ref float DmgModClub => ref Schema.GetRef<float>(this.Handle, "CPropDataComponent", "m_flDmgModClub");
+
+	// m_flDmgModExplosive
+	[SchemaMember("CPropDataComponent", "m_flDmgModExplosive")]
+	public ref float DmgModExplosive => ref Schema.GetRef<float>(this.Handle, "CPropDataComponent", "m_flDmgModExplosive");
+
+	// m_flDmgModFire
+	[SchemaMember("CPropDataComponent", "m_flDmgModFire")]
+	public ref float DmgModFire => ref Schema.GetRef<float>(this.Handle, "CPropDataComponent", "m_flDmgModFire");
+
+	// m_iszPhysicsDamageTableName
+	[SchemaMember("CPropDataComponent", "m_iszPhysicsDamageTableName")]
+	public string PhysicsDamageTableName
+	{
+		get { return Schema.GetUtf8String(this.Handle, "CPropDataComponent", "m_iszPhysicsDamageTableName"); }
+		set { Schema.SetString(this.Handle, "CPropDataComponent", "m_iszPhysicsDamageTableName", value); }
+	}
+
+	// m_iszBasePropData
+	[SchemaMember("CPropDataComponent", "m_iszBasePropData")]
+	public string BasePropData
+	{
+		get { return Schema.GetUtf8String(this.Handle, "CPropDataComponent", "m_iszBasePropData"); }
+		set { Schema.SetString(this.Handle, "CPropDataComponent", "m_iszBasePropData", value); }
+	}
+
+	// m_nInteractions
+	[SchemaMember("CPropDataComponent", "m_nInteractions")]
+	public ref Int32 Interactions => ref Schema.GetRef<Int32>(this.Handle, "CPropDataComponent", "m_nInteractions");
+
+	// m_bSpawnMotionDisabled
+	[SchemaMember("CPropDataComponent", "m_bSpawnMotionDisabled")]
+	public ref bool SpawnMotionDisabled => ref Schema.GetRef<bool>(this.Handle, "CPropDataComponent", "m_bSpawnMotionDisabled");
+
+	// m_nDisableTakePhysicsDamageSpawnFlag
+	[SchemaMember("CPropDataComponent", "m_nDisableTakePhysicsDamageSpawnFlag")]
+	public ref Int32 DisableTakePhysicsDamageSpawnFlag => ref Schema.GetRef<Int32>(this.Handle, "CPropDataComponent", "m_nDisableTakePhysicsDamageSpawnFlag");
+
+	// m_nMotionDisabledSpawnFlag
+	[SchemaMember("CPropDataComponent", "m_nMotionDisabledSpawnFlag")]
+	public ref Int32 MotionDisabledSpawnFlag => ref Schema.GetRef<Int32>(this.Handle, "CPropDataComponent", "m_nMotionDisabledSpawnFlag");
+
+}
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CRagdollProp.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CRagdollProp.g.cs
@@ -86,10 +86,6 @@ public partial class CRagdollProp : CBaseAnimGraph
 	[SchemaMember("CRagdollProp", "m_flLastOriginChangeTime")]
 	public ref float LastOriginChangeTime => ref Schema.GetRef<float>(this.Handle, "CRagdollProp", "m_flLastOriginChangeTime");

-	// m_nBloodColor
-	[SchemaMember("CRagdollProp", "m_nBloodColor")]
-	public ref Int32 BloodColor => ref Schema.GetRef<Int32>(this.Handle, "CRagdollProp", "m_nBloodColor");
-
 	// m_strOriginClassName
 	[SchemaMember("CRagdollProp", "m_strOriginClassName")]
 	public string StrOriginClassName
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CSceneEntity.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CSceneEntity.g.cs
@@ -130,6 +130,14 @@ public partial class CSceneEntity : CPointEntity
 	[SchemaMember("CSceneEntity", "m_hTarget8")]
 	public CHandle<CBaseEntity> HTarget8 => Schema.GetDeclaredClass<CHandle<CBaseEntity>>(this.Handle, "CSceneEntity", "m_hTarget8");

+	// m_sTargetAttachment
+	[SchemaMember("CSceneEntity", "m_sTargetAttachment")]
+	public string TargetAttachment
+	{
+		get { return Schema.GetUtf8String(this.Handle, "CSceneEntity", "m_sTargetAttachment"); }
+		set { Schema.SetString(this.Handle, "CSceneEntity", "m_sTargetAttachment", value); }
+	}
+
 	// m_bIsPlayingBack
 	[SchemaMember("CSceneEntity", "m_bIsPlayingBack")]
 	public ref bool IsPlayingBack => ref Schema.GetRef<bool>(this.Handle, "CSceneEntity", "m_bIsPlayingBack");
@@ -214,6 +222,10 @@ public partial class CSceneEntity : CPointEntity
 	[SchemaMember("CSceneEntity", "m_bBreakOnNonIdle")]
 	public ref bool BreakOnNonIdle => ref Schema.GetRef<bool>(this.Handle, "CSceneEntity", "m_bBreakOnNonIdle");

+	// m_bSceneFinished
+	[SchemaMember("CSceneEntity", "m_bSceneFinished")]
+	public ref bool SceneFinished => ref Schema.GetRef<bool>(this.Handle, "CSceneEntity", "m_bSceneFinished");
+
 	// m_hActorList
 	[SchemaMember("CSceneEntity", "m_hActorList")]
 	public NetworkedVector<CHandle<CBaseFlex>> ActorList => Schema.GetDeclaredClass<NetworkedVector<CHandle<CBaseFlex>>>(this.Handle, "CSceneEntity", "m_hActorList");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CScriptItem.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CScriptItem.g.cs
@@ -18,10 +18,6 @@ public partial class CScriptItem : CItem
 {
    public CScriptItem (IntPtr pointer) : base(pointer) {}

-	// m_OnPlayerPickup
-	[SchemaMember("CScriptItem", "m_OnPlayerPickup")]
-	public CEntityIOOutput OnPlayerPickup => Schema.GetDeclaredClass<CEntityIOOutput>(this.Handle, "CScriptItem", "m_OnPlayerPickup");
-
 	// m_MoveTypeOverride
 	[SchemaMember("CScriptItem", "m_MoveTypeOverride")]
 	public ref MoveType_t MoveTypeOverride => ref Schema.GetRef<MoveType_t>(this.Handle, "CScriptItem", "m_MoveTypeOverride");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CScriptedSequence.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CScriptedSequence.g.cs
@@ -86,6 +86,10 @@ public partial class CScriptedSequence : CBaseEntity
 	[SchemaMember("CScriptedSequence", "m_nMoveTo")]
 	public ref ScriptedMoveTo_t MoveTo => ref Schema.GetRef<ScriptedMoveTo_t>(this.Handle, "CScriptedSequence", "m_nMoveTo");

+	// m_nMoveToGait
+	[SchemaMember("CScriptedSequence", "m_nMoveToGait")]
+	public ref MovementGait_t MoveToGait => ref Schema.GetRef<MovementGait_t>(this.Handle, "CScriptedSequence", "m_nMoveToGait");
+
 	// m_bIsPlayingPreIdle
 	[SchemaMember("CScriptedSequence", "m_bIsPlayingPreIdle")]
 	public ref bool IsPlayingPreIdle => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bIsPlayingPreIdle");
@@ -102,6 +106,46 @@ public partial class CScriptedSequence : CBaseEntity
 	[SchemaMember("CScriptedSequence", "m_bIsPlayingPostIdle")]
 	public ref bool IsPlayingPostIdle => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bIsPlayingPostIdle");

+	// m_bDontRotateOther
+	[SchemaMember("CScriptedSequence", "m_bDontRotateOther")]
+	public ref bool DontRotateOther => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bDontRotateOther");
+
+	// m_bIsRepeatable
+	[SchemaMember("CScriptedSequence", "m_bIsRepeatable")]
+	public ref bool IsRepeatable => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bIsRepeatable");
+
+	// m_bShouldLeaveCorpse
+	[SchemaMember("CScriptedSequence", "m_bShouldLeaveCorpse")]
+	public ref bool ShouldLeaveCorpse => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bShouldLeaveCorpse");
+
+	// m_bStartOnSpawn
+	[SchemaMember("CScriptedSequence", "m_bStartOnSpawn")]
+	public ref bool StartOnSpawn => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bStartOnSpawn");
+
+	// m_bDisallowInterrupts
+	[SchemaMember("CScriptedSequence", "m_bDisallowInterrupts")]
+	public ref bool DisallowInterrupts => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bDisallowInterrupts");
+
+	// m_bCanOverrideNPCState
+	[SchemaMember("CScriptedSequence", "m_bCanOverrideNPCState")]
+	public ref bool CanOverrideNPCState => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bCanOverrideNPCState");
+
+	// m_bDontTeleportAtEnd
+	[SchemaMember("CScriptedSequence", "m_bDontTeleportAtEnd")]
+	public ref bool DontTeleportAtEnd => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bDontTeleportAtEnd");
+
+	// m_bHighPriority
+	[SchemaMember("CScriptedSequence", "m_bHighPriority")]
+	public ref bool HighPriority => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bHighPriority");
+
+	// m_bHideDebugComplaints
+	[SchemaMember("CScriptedSequence", "m_bHideDebugComplaints")]
+	public ref bool HideDebugComplaints => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bHideDebugComplaints");
+
+	// m_bContinueOnDeath
+	[SchemaMember("CScriptedSequence", "m_bContinueOnDeath")]
+	public ref bool ContinueOnDeath => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bContinueOnDeath");
+
 	// m_bLoopPreIdleSequence
 	[SchemaMember("CScriptedSequence", "m_bLoopPreIdleSequence")]
 	public ref bool LoopPreIdleSequence => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bLoopPreIdleSequence");
@@ -182,9 +226,9 @@ public partial class CScriptedSequence : CBaseEntity
 	[SchemaMember("CScriptedSequence", "m_savedCollisionGroup")]
 	public ref Int32 SavedCollisionGroup => ref Schema.GetRef<Int32>(this.Handle, "CScriptedSequence", "m_savedCollisionGroup");

-	// m_interruptable
-	[SchemaMember("CScriptedSequence", "m_interruptable")]
-	public ref bool Interruptable => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_interruptable");
+	// m_bInterruptable
+	[SchemaMember("CScriptedSequence", "m_bInterruptable")]
+	public ref bool Interruptable => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bInterruptable");

 	// m_sequenceStarted
 	[SchemaMember("CScriptedSequence", "m_sequenceStarted")]
@@ -218,10 +262,6 @@ public partial class CScriptedSequence : CBaseEntity
 	[SchemaMember("CScriptedSequence", "m_bAllowCustomInterruptConditions")]
 	public ref bool AllowCustomInterruptConditions => ref Schema.GetRef<bool>(this.Handle, "CScriptedSequence", "m_bAllowCustomInterruptConditions");

-	// m_hLastFoundEntity
-	[SchemaMember("CScriptedSequence", "m_hLastFoundEntity")]
-	public CHandle<CBaseEntity> LastFoundEntity => Schema.GetDeclaredClass<CHandle<CBaseEntity>>(this.Handle, "CScriptedSequence", "m_hLastFoundEntity");
-
 	// m_hForcedTarget
 	[SchemaMember("CScriptedSequence", "m_hForcedTarget")]
 	public CHandle<CBaseAnimGraph> ForcedTarget => Schema.GetDeclaredClass<CHandle<CBaseAnimGraph>>(this.Handle, "CScriptedSequence", "m_hForcedTarget");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CSound.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CSound.g.cs
@@ -34,10 +34,6 @@ public partial class CSound : NativeObject
 	[SchemaMember("CSound", "m_flOcclusionScale")]
 	public ref float OcclusionScale => ref Schema.GetRef<float>(this.Handle, "CSound", "m_flOcclusionScale");

-	// m_iType
-	[SchemaMember("CSound", "m_iType")]
-	public ref Int32 Type => ref Schema.GetRef<Int32>(this.Handle, "CSound", "m_iType");
-
 	// m_iNextAudible
 	[SchemaMember("CSound", "m_iNextAudible")]
 	public ref Int32 NextAudible => ref Schema.GetRef<Int32>(this.Handle, "CSound", "m_iNextAudible");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CSoundEventEntity.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CSoundEventEntity.g.cs
@@ -74,4 +74,8 @@ public partial class CSoundEventEntity : CBaseEntity
 	[SchemaMember("CSoundEventEntity", "m_hSource")]
 	public CHandle<CEntityInstance> Source => Schema.GetDeclaredClass<CHandle<CEntityInstance>>(this.Handle, "CSoundEventEntity", "m_hSource");

+	// m_nEntityIndexSelection
+	[SchemaMember("CSoundEventEntity", "m_nEntityIndexSelection")]
+	public ref Int32 EntityIndexSelection => ref Schema.GetRef<Int32>(this.Handle, "CSoundEventEntity", "m_nEntityIndexSelection");
+
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CSoundEventPathCornerEntity.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CSoundEventPathCornerEntity.g.cs
@@ -42,8 +42,8 @@ public partial class CSoundEventPathCornerEntity : CSoundEventEntity
 	[SchemaMember("CSoundEventPathCornerEntity", "m_flDotProductMax")]
 	public ref float DotProductMax => ref Schema.GetRef<float>(this.Handle, "CSoundEventPathCornerEntity", "m_flDotProductMax");

-	// bPlaying
-	[SchemaMember("CSoundEventPathCornerEntity", "bPlaying")]
-	public ref bool BPlaying => ref Schema.GetRef<bool>(this.Handle, "CSoundEventPathCornerEntity", "bPlaying");
+	// m_bPlaying
+	[SchemaMember("CSoundEventPathCornerEntity", "m_bPlaying")]
+	public ref bool Playing => ref Schema.GetRef<bool>(this.Handle, "CSoundEventPathCornerEntity", "m_bPlaying");

 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CSplineConstraint.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CSplineConstraint.g.cs
@@ -18,4 +18,8 @@ public partial class CSplineConstraint : CPhysConstraint
 {
    public CSplineConstraint (IntPtr pointer) : base(pointer) {}

+	// m_vAnchorOffsetRestore
+	[SchemaMember("CSplineConstraint", "m_vAnchorOffsetRestore")]
+	public Vector AnchorOffsetRestore => Schema.GetDeclaredClass<Vector>(this.Handle, "CSplineConstraint", "m_vAnchorOffsetRestore");
+
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTakeDamageInfo.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTakeDamageInfo.g.cs
@@ -50,6 +50,10 @@ public partial class CTakeDamageInfo : NativeObject
 	[SchemaMember("CTakeDamageInfo", "m_flDamage")]
 	public ref float Damage => ref Schema.GetRef<float>(this.Handle, "CTakeDamageInfo", "m_flDamage");

+	// m_flTotalledDamage
+	[SchemaMember("CTakeDamageInfo", "m_flTotalledDamage")]
+	public ref float TotalledDamage => ref Schema.GetRef<float>(this.Handle, "CTakeDamageInfo", "m_flTotalledDamage");
+
 	// m_bitsDamageType
 	[SchemaMember("CTakeDamageInfo", "m_bitsDamageType")]
 	public ref Int32 BitsDamageType => ref Schema.GetRef<Int32>(this.Handle, "CTakeDamageInfo", "m_bitsDamageType");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTriggerLook.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTriggerLook.g.cs
@@ -58,10 +58,6 @@ public partial class CTriggerLook : CTriggerOnce
 	[SchemaMember("CTriggerLook", "m_bUseVelocity")]
 	public ref bool UseVelocity => ref Schema.GetRef<bool>(this.Handle, "CTriggerLook", "m_bUseVelocity");

-	// m_hActivator
-	[SchemaMember("CTriggerLook", "m_hActivator")]
-	public CHandle<CBaseEntity> Activator => Schema.GetDeclaredClass<CHandle<CBaseEntity>>(this.Handle, "CTriggerLook", "m_hActivator");
-
 	// m_bTestOcclusion
 	[SchemaMember("CTriggerLook", "m_bTestOcclusion")]
 	public ref bool TestOcclusion => ref Schema.GetRef<bool>(this.Handle, "CTriggerLook", "m_bTestOcclusion");
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTriggerPush.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTriggerPush.g.cs
@@ -30,4 +30,24 @@ public partial class CTriggerPush : CBaseTrigger
 	[SchemaMember("CTriggerPush", "m_bTriggerOnStartTouch")]
 	public ref bool TriggerOnStartTouch => ref Schema.GetRef<bool>(this.Handle, "CTriggerPush", "m_bTriggerOnStartTouch");

+	// m_bUsePathSimple
+	[SchemaMember("CTriggerPush", "m_bUsePathSimple")]
+	public ref bool UsePathSimple => ref Schema.GetRef<bool>(this.Handle, "CTriggerPush", "m_bUsePathSimple");
+
+	// m_iszPathSimpleName
+	[SchemaMember("CTriggerPush", "m_iszPathSimpleName")]
+	public string PathSimpleName
+	{
+		get { return Schema.GetUtf8String(this.Handle, "CTriggerPush", "m_iszPathSimpleName"); }
+		set { Schema.SetString(this.Handle, "CTriggerPush", "m_iszPathSimpleName", value); }
+	}
+
+	// m_PathSimple
+	[SchemaMember("CTriggerPush", "m_PathSimple")]
+	public CPathSimple? PathSimple => Schema.GetPointer<CPathSimple>(this.Handle, "CTriggerPush", "m_PathSimple");
+
+	// m_splinePushType
+	[SchemaMember("CTriggerPush", "m_splinePushType")]
+	public ref UInt32 SplinePushType => ref Schema.GetRef<UInt32>(this.Handle, "CTriggerPush", "m_splinePushType");
+
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTriggerSndSosOpvar.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTriggerSndSosOpvar.g.cs
@@ -38,10 +38,6 @@ public partial class CTriggerSndSosOpvar : CBaseTrigger
 	[SchemaMember("CTriggerSndSosOpvar", "m_flMaxVal")]
 	public ref float MaxVal => ref Schema.GetRef<float>(this.Handle, "CTriggerSndSosOpvar", "m_flMaxVal");

-	// m_flWait
-	[SchemaMember("CTriggerSndSosOpvar", "m_flWait")]
-	public ref float Wait => ref Schema.GetRef<float>(this.Handle, "CTriggerSndSosOpvar", "m_flWait");
-
 	// m_opvarName
 	[SchemaMember("CTriggerSndSosOpvar", "m_opvarName")]
 	public string OpvarName
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTriggerToggleSave.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTriggerToggleSave.g.cs
@@ -18,8 +18,4 @@ public partial class CTriggerToggleSave : CBaseTrigger
 {
    public CTriggerToggleSave (IntPtr pointer) : base(pointer) {}

-	// m_bDisabled
-	[SchemaMember("CTriggerToggleSave", "m_bDisabled")]
-	public ref bool Disabled => ref Schema.GetRef<bool>(this.Handle, "CTriggerToggleSave", "m_bDisabled");
-
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTriggerHurtGhost.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/CTriggerHurtGhost.g.cs
@@ -1,21 +1,25 @@
-// <auto-generated />
-#nullable enable
-#pragma warning disable CS1591
-
-using System;
-using System.Diagnostics;
-using System.Drawing;
-using CounterStrikeSharp;
-using CounterStrikeSharp.API.Modules.Events;
-using CounterStrikeSharp.API.Modules.Entities;
-using CounterStrikeSharp.API.Modules.Memory;
-using CounterStrikeSharp.API.Modules.Utils;
-using CounterStrikeSharp.API.Core.Attributes;
-
-namespace CounterStrikeSharp.API.Core;
-
-public partial class CTriggerHurtGhost : CTriggerHurt
-{
-    public CTriggerHurtGhost (IntPtr pointer) : base(pointer) {}
-
-}
+// <auto-generated />
+#nullable enable
+#pragma warning disable CS1591
+
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using CounterStrikeSharp;
+using CounterStrikeSharp.API.Modules.Events;
+using CounterStrikeSharp.API.Modules.Entities;
+using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Modules.Utils;
+using CounterStrikeSharp.API.Core.Attributes;
+
+namespace CounterStrikeSharp.API.Core;
+
+public partial class SceneEventId_t : NativeObject
+{
+    public SceneEventId_t (IntPtr pointer) : base(pointer) {}
+
+	// m_Value
+	[SchemaMember("SceneEventId_t", "m_Value")]
+	public ref UInt32 Value => ref Schema.GetRef<UInt32>(this.Handle, "SceneEventId_t", "m_Value");
+
+}
--- a/managed/CounterStrikeSharp.API/Core/Schema/Classes/SpawnPointCoopEnemy.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Classes/SpawnPointCoopEnemy.g.cs
@@ -1,65 +0,0 @@
-// <auto-generated />
-#nullable enable
-#pragma warning disable CS1591
-
-using System;
-using System.Diagnostics;
-using System.Drawing;
-using CounterStrikeSharp;
-using CounterStrikeSharp.API.Modules.Events;
-using CounterStrikeSharp.API.Modules.Entities;
-using CounterStrikeSharp.API.Modules.Memory;
-using CounterStrikeSharp.API.Modules.Utils;
-using CounterStrikeSharp.API.Core.Attributes;
-
-namespace CounterStrikeSharp.API.Core;
-
-public partial class SpawnPointCoopEnemy : SpawnPoint
-{
-    public SpawnPointCoopEnemy (IntPtr pointer) : base(pointer) {}
-
-	// m_szWeaponsToGive
-	[SchemaMember("SpawnPointCoopEnemy", "m_szWeaponsToGive")]
-	public string WeaponsToGive
-	{
-		get { return Schema.GetUtf8String(this.Handle, "SpawnPointCoopEnemy", "m_szWeaponsToGive"); }
-		set { Schema.SetString(this.Handle, "SpawnPointCoopEnemy", "m_szWeaponsToGive", value); }
-	}
-
-	// m_szPlayerModelToUse
-	[SchemaMember("SpawnPointCoopEnemy", "m_szPlayerModelToUse")]
-	public string PlayerModelToUse
-	{
-		get { return Schema.GetUtf8String(this.Handle, "SpawnPointCoopEnemy", "m_szPlayerModelToUse"); }
-		set { Schema.SetString(this.Handle, "SpawnPointCoopEnemy", "m_szPlayerModelToUse", value); }
-	}
-
-	// m_nArmorToSpawnWith
-	[SchemaMember("SpawnPointCoopEnemy", "m_nArmorToSpawnWith")]
-	public ref Int32 ArmorToSpawnWith => ref Schema.GetRef<Int32>(this.Handle, "SpawnPointCoopEnemy", "m_nArmorToSpawnWith");
-
-	// m_nBotDifficulty
-	[SchemaMember("SpawnPointCoopEnemy", "m_nBotDifficulty")]
-	public ref Int32 BotDifficulty => ref Schema.GetRef<Int32>(this.Handle, "SpawnPointCoopEnemy", "m_nBotDifficulty");
-
-	// m_bIsAgressive
-	[SchemaMember("SpawnPointCoopEnemy", "m_bIsAgressive")]
-	public ref bool IsAgressive => ref Schema.GetRef<bool>(this.Handle, "SpawnPointCoopEnemy", "m_bIsAgressive");
-
-	// m_bStartAsleep
-	[SchemaMember("SpawnPointCoopEnemy", "m_bStartAsleep")]
-	public ref bool StartAsleep => ref Schema.GetRef<bool>(this.Handle, "SpawnPointCoopEnemy", "m_bStartAsleep");
-
-	// m_flHideRadius
-	[SchemaMember("SpawnPointCoopEnemy", "m_flHideRadius")]
-	public ref float HideRadius => ref Schema.GetRef<float>(this.Handle, "SpawnPointCoopEnemy", "m_flHideRadius");
-
-	// m_szBehaviorTreeFile
-	[SchemaMember("SpawnPointCoopEnemy", "m_szBehaviorTreeFile")]
-	public string BehaviorTreeFile
-	{
-		get { return Schema.GetUtf8String(this.Handle, "SpawnPointCoopEnemy", "m_szBehaviorTreeFile"); }
-		set { Schema.SetString(this.Handle, "SpawnPointCoopEnemy", "m_szBehaviorTreeFile", value); }
-	}
-
-}
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/ActionType_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/ActionType_t.g.cs
@@ -14,4 +14,6 @@ public enum ActionType_t : uint
 	SOS_ACTION_TIME_BLOCK_LIMITER = 0x3,
 	SOS_ACTION_SET_SOUNDEVENT_PARAM = 0x4,
 	SOS_ACTION_SOUNDEVENT_CLUSTER = 0x5,
+	SOS_ACTION_SOUNDEVENT_PRIORITY = 0x6,
+	SOS_ACTION_COUNT_ENVELOPE = 0x7,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/AnimValueSource.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/AnimValueSource.g.cs
@@ -13,36 +13,35 @@ public enum AnimValueSource : uint
 	ForwardSpeed = 0x2,
 	StrafeSpeed = 0x3,
 	FacingHeading = 0x4,
-	ManualFacingHeading = 0x5,
-	LookHeading = 0x6,
-	LookPitch = 0x7,
-	LookDistance = 0x8,
-	Parameter = 0x9,
-	WayPointHeading = 0xA,
-	WayPointDistance = 0xB,
-	BoundaryRadius = 0xC,
-	TargetMoveHeading = 0xD,
-	TargetMoveSpeed = 0xE,
-	AccelerationHeading = 0xF,
-	AccelerationSpeed = 0x10,
-	SlopeHeading = 0x11,
-	SlopeAngle = 0x12,
-	SlopePitch = 0x13,
-	SlopeYaw = 0x14,
-	GoalDistance = 0x15,
-	AccelerationLeftRight = 0x16,
-	AccelerationFrontBack = 0x17,
-	RootMotionSpeed = 0x18,
-	RootMotionTurnSpeed = 0x19,
-	MoveHeadingRelativeToLookHeading = 0x1A,
-	MaxMoveSpeed = 0x1B,
-	FingerCurl_Thumb = 0x1C,
-	FingerCurl_Index = 0x1D,
-	FingerCurl_Middle = 0x1E,
-	FingerCurl_Ring = 0x1F,
-	FingerCurl_Pinky = 0x20,
-	FingerSplay_Thumb_Index = 0x21,
-	FingerSplay_Index_Middle = 0x22,
-	FingerSplay_Middle_Ring = 0x23,
-	FingerSplay_Ring_Pinky = 0x24,
+	LookHeading = 0x5,
+	LookPitch = 0x6,
+	LookDistance = 0x7,
+	Parameter = 0x8,
+	WayPointHeading = 0x9,
+	WayPointDistance = 0xA,
+	BoundaryRadius = 0xB,
+	TargetMoveHeading = 0xC,
+	TargetMoveSpeed = 0xD,
+	AccelerationHeading = 0xE,
+	AccelerationSpeed = 0xF,
+	SlopeHeading = 0x10,
+	SlopeAngle = 0x11,
+	SlopePitch = 0x12,
+	SlopeYaw = 0x13,
+	GoalDistance = 0x14,
+	AccelerationLeftRight = 0x15,
+	AccelerationFrontBack = 0x16,
+	RootMotionSpeed = 0x17,
+	RootMotionTurnSpeed = 0x18,
+	MoveHeadingRelativeToLookHeading = 0x19,
+	MaxMoveSpeed = 0x1A,
+	FingerCurl_Thumb = 0x1B,
+	FingerCurl_Index = 0x1C,
+	FingerCurl_Middle = 0x1D,
+	FingerCurl_Ring = 0x1E,
+	FingerCurl_Pinky = 0x1F,
+	FingerSplay_Thumb_Index = 0x20,
+	FingerSplay_Index_Middle = 0x21,
+	FingerSplay_Middle_Ring = 0x22,
+	FingerSplay_Ring_Pinky = 0x23,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/AnimVectorSource.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/AnimVectorSource.g.cs
@@ -21,4 +21,5 @@ public enum AnimVectorSource : uint
 	WayPointPosition = 0xA,
 	GoalPosition = 0xB,
 	RootMotionVelocity = 0xC,
+	ManualTarget_WorldSpace = 0xD,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/BloodType.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/BloodType.g.cs
@@ -0,0 +1,26 @@
+// <auto-generated />
+#nullable enable
+#pragma warning disable CS1591
+
+using System;
+
+namespace CounterStrikeSharp.API.Core;
+
+public enum BloodType : uint
+{
+	None = 0xFFFFFFFF,
+	ColorRed = 0x0,
+	ColorYellow = 0x1,
+	ColorGreen = 0x2,
+	ColorBrightGreen = 0x3,
+	EntityMech = 0x4,
+	EntityAntlion = 0x5,
+	EntityZombie = 0x6,
+	EntityBlob = 0x7,
+	EntityBlobFrozen = 0x8,
+	ColorRedLVL2 = 0x9,
+	ColorRedLVL3 = 0xA,
+	ColorRedLVL4 = 0xB,
+	ColorRedLVL5 = 0xC,
+	ColorRedLVL6 = 0xD,
+}
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/ChickenActivity.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/ChickenActivity.g.cs
@@ -9,10 +9,10 @@ namespace CounterStrikeSharp.API.Core;
 public enum ChickenActivity : uint
 {
 	IDLE = 0x0,
-	WALK = 0x1,
-	RUN = 0x2,
-	HOP = 0x3,
-	JUMP = 0x4,
-	GLIDE = 0x5,
-	LAND = 0x6,
+	SQUAT = 0x1,
+	WALK = 0x2,
+	RUN = 0x3,
+	GLIDE = 0x4,
+	LAND = 0x5,
+	PANIC = 0x6,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/DebugOverlayBits_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/DebugOverlayBits_t.g.cs
@@ -44,6 +44,7 @@ public enum DebugOverlayBits_t : ulong
 	OVERLAY_NPC_RELATION_BIT = 0x400000000,
 	OVERLAY_VIEWOFFSET = 0x800000000,
 	OVERLAY_VCOLLIDE_WIREFRAME_BIT = 0x1000000000,
+	OVERLAY_NPC_SCRIPTED_COMMANDS_BIT = 0x2000000000,
 	OVERLAY_ACTORNAME_BIT = 0x4000000000,
 	OVERLAY_NPC_CONDITIONS_TEXT_BIT = 0x8000000000,
 	OVERLAY_NPC_ABILITY_RANGE_DEBUG_BIT = 0x10000000000,
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/FacingMode.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/FacingMode.g.cs
@@ -6,9 +6,11 @@ using System;

 namespace CounterStrikeSharp.API.Core;

-public enum FacingMode : uint
+public enum FacingMode : byte
 {
-	FacingMode_Manual = 0x0,
-	FacingMode_Path = 0x1,
-	FacingMode_LookTarget = 0x2,
+	FacingMode_Invalid = 0x0,
+	FacingMode_Manual = 0x1,
+	FacingMode_Path = 0x2,
+	FacingMode_LookTarget = 0x3,
+	FacingMode_ManualPosition = 0x4,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/GameAnimEventIndex_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/GameAnimEventIndex_t.g.cs
@@ -34,21 +34,22 @@ public enum GameAnimEventIndex_t : uint
 	AE_CL_CLOTH_STIFFEN = 0x17,
 	AE_CL_CLOTH_EFFECT = 0x18,
 	AE_CL_CREATE_ANIM_SCOPE_PROP = 0x19,
-	AE_PULSE_GRAPH = 0x1A,
-	AE_PULSE_GRAPH_LOOKAT = 0x1B,
-	AE_PULSE_GRAPH_AIMAT = 0x1C,
-	AE_PULSE_GRAPH_IKLOCKLEFTARM = 0x1D,
-	AE_PULSE_GRAPH_IKLOCKRIGHTARM = 0x1E,
-	AE_CL_WEAPON_TRANSITION_INTO_HAND = 0x1F,
-	AE_CL_BODYGROUP_SET_TO_CLIP = 0x20,
-	AE_CL_BODYGROUP_SET_TO_NEXTCLIP = 0x21,
-	AE_SV_SHOW_SILENCER = 0x22,
-	AE_SV_ATTACH_SILENCER_COMPLETE = 0x23,
-	AE_SV_HIDE_SILENCER = 0x24,
-	AE_SV_DETACH_SILENCER_COMPLETE = 0x25,
-	AE_CL_EJECT_MAG = 0x26,
-	AE_WPN_COMPLETE_RELOAD = 0x27,
-	AE_WPN_HEALTHSHOT_INJECT = 0x28,
-	AE_CL_C4_SCREEN_TEXT = 0x29,
-	AE_GRENADE_THROW_COMPLETE = 0x2A,
+	AE_SV_IKLOCK = 0x1A,
+	AE_PULSE_GRAPH = 0x1B,
+	AE_PULSE_GRAPH_LOOKAT = 0x1C,
+	AE_PULSE_GRAPH_AIMAT = 0x1D,
+	AE_PULSE_GRAPH_IKLOCKLEFTARM = 0x1E,
+	AE_PULSE_GRAPH_IKLOCKRIGHTARM = 0x1F,
+	AE_CL_WEAPON_TRANSITION_INTO_HAND = 0x20,
+	AE_CL_BODYGROUP_SET_TO_CLIP = 0x21,
+	AE_CL_BODYGROUP_SET_TO_NEXTCLIP = 0x22,
+	AE_SV_SHOW_SILENCER = 0x23,
+	AE_SV_ATTACH_SILENCER_COMPLETE = 0x24,
+	AE_SV_HIDE_SILENCER = 0x25,
+	AE_SV_DETACH_SILENCER_COMPLETE = 0x26,
+	AE_CL_EJECT_MAG = 0x27,
+	AE_WPN_COMPLETE_RELOAD = 0x28,
+	AE_WPN_HEALTHSHOT_INJECT = 0x29,
+	AE_CL_C4_SCREEN_TEXT = 0x2A,
+	AE_GRENADE_THROW_COMPLETE = 0x2B,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/MovementGait_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/MovementGait_t.g.cs
@@ -9,8 +9,9 @@ namespace CounterStrikeSharp.API.Core;
 public enum MovementGait_t : byte
 {
 	eInvalid = 0xFF,
-	eWalk = 0x0,
-	eJog = 0x1,
-	eRun = 0x2,
-	eSprint = 0x3,
+	eSlow = 0x0,
+	eMedium = 0x1,
+	eFast = 0x2,
+	eVeryFast = 0x3,
+	eCount = 0x4,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/NPCLookType_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/NPCLookType_t.g.cs
@@ -1,14 +0,0 @@
-// <auto-generated />
-#nullable enable
-#pragma warning disable CS1591
-
-using System;
-
-namespace CounterStrikeSharp.API.Core;
-
-public enum NPCLookType_t : uint
-{
-	Chest = 0x0,
-	Head = 0x1,
-	Eyes = 0x2,
-}
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/NavAttributeEnum.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/NavAttributeEnum.g.cs
@@ -12,6 +12,7 @@ public enum NavAttributeEnum : uint
 	NAV_MESH_STAIRS = 0x1000,
 	NAV_MESH_NON_ZUP = 0x8000,
 	NAV_MESH_SHORT_HEIGHT = 0x10000,
+	NAV_MESH_NON_ZUP_TRANSITION = 0x20000,
 	NAV_MESH_CROUCH = 0x10000,
 	NAV_MESH_JUMP = 0x2,
 	NAV_MESH_PRECISE = 0x4,
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/PulseCursorExecResult_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/PulseCursorExecResult_t.g.cs
@@ -11,4 +11,5 @@ public enum PulseCursorExecResult_t : uint
 	Succeeded = 0x0,
 	Canceled = 0x1,
 	Failed = 0x2,
+	OngoingNotify = 0x3,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/PulseInstructionCode_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/PulseInstructionCode_t.g.cs
@@ -24,7 +24,7 @@ public enum PulseInstructionCode_t : ushort
 	SET_VAR = 0xD,
 	GET_VAR = 0xE,
 	GET_CONST = 0xF,
-	SET_REGISTER_DOMAIN_VALUE = 0x10,
+	GET_DOMAIN_VALUE = 0x10,
 	COPY = 0x11,
 	NOT = 0x12,
 	NEGATE = 0x13,
@@ -40,33 +40,45 @@ public enum PulseInstructionCode_t : ushort
 	AND = 0x1D,
 	OR = 0x1E,
 	CONVERT_VALUE = 0x1F,
-	LAST_SERIALIZED_CODE = 0x20,
-	NEGATE_INT = 0x21,
-	NEGATE_FLOAT = 0x22,
-	ADD_INT = 0x23,
-	ADD_FLOAT = 0x24,
-	ADD_STRING = 0x25,
-	SUB_INT = 0x26,
-	SUB_FLOAT = 0x27,
-	MUL_INT = 0x28,
-	MUL_FLOAT = 0x29,
-	DIV_INT = 0x2A,
-	DIV_FLOAT = 0x2B,
-	MOD_INT = 0x2C,
-	MOD_FLOAT = 0x2D,
-	LT_INT = 0x2E,
-	LT_FLOAT = 0x2F,
-	LTE_INT = 0x30,
-	LTE_FLOAT = 0x31,
-	EQ_BOOL = 0x32,
-	EQ_INT = 0x33,
-	EQ_FLOAT = 0x34,
-	EQ_STRING = 0x35,
-	EQ_ENTITY_NAME = 0x36,
-	NE_BOOL = 0x37,
-	NE_INT = 0x38,
-	NE_FLOAT = 0x39,
-	NE_STRING = 0x3A,
-	NE_ENTITY_NAME = 0x3B,
-	GET_CONST_INLINE_STORAGE = 0x3C,
+	REINTERPRET_INSTANCE = 0x20,
+	GET_BLACKBOARD_REFERENCE = 0x21,
+	SET_BLACKBOARD_REFERENCE = 0x22,
+	REQUIREMENT_RESULT = 0x23,
+	LAST_SERIALIZED_CODE = 0x24,
+	NEGATE_INT = 0x25,
+	NEGATE_FLOAT = 0x26,
+	ADD_INT = 0x27,
+	ADD_FLOAT = 0x28,
+	ADD_STRING = 0x29,
+	SUB_INT = 0x2A,
+	SUB_FLOAT = 0x2B,
+	MUL_INT = 0x2C,
+	MUL_FLOAT = 0x2D,
+	DIV_INT = 0x2E,
+	DIV_FLOAT = 0x2F,
+	MOD_INT = 0x30,
+	MOD_FLOAT = 0x31,
+	LT_INT = 0x32,
+	LT_FLOAT = 0x33,
+	LTE_INT = 0x34,
+	LTE_FLOAT = 0x35,
+	EQ_BOOL = 0x36,
+	EQ_INT = 0x37,
+	EQ_FLOAT = 0x38,
+	EQ_STRING = 0x39,
+	EQ_ENTITY_NAME = 0x3A,
+	EQ_EHANDLE = 0x3B,
+	EQ_PANEL_HANDLE = 0x3C,
+	EQ_OPAQUE_HANDLE = 0x3D,
+	EQ_TEST_HANDLE = 0x3E,
+	NE_BOOL = 0x3F,
+	NE_INT = 0x40,
+	NE_FLOAT = 0x41,
+	NE_STRING = 0x42,
+	NE_ENTITY_NAME = 0x43,
+	NE_EHANDLE = 0x44,
+	NE_PANEL_HANDLE = 0x45,
+	NE_OPAQUE_HANDLE = 0x46,
+	NE_TEST_HANDLE = 0x47,
+	GET_CONST_INLINE_STORAGE = 0x48,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/PulseValueType_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/PulseValueType_t.g.cs
@@ -20,11 +20,12 @@ public enum PulseValueType_t : uint
 	PVAL_RESOURCE = 0x8,
 	PVAL_SNDEVT_GUID = 0x9,
 	PVAL_ENTITY_NAME = 0xA,
-	PVAL_SCHEMA_PTR = 0xB,
+	PVAL_OPAQUE_HANDLE = 0xB,
 	PVAL_TYPESAFE_INT = 0xC,
 	PVAL_CURSOR_FLOW = 0xD,
 	PVAL_ANY = 0xE,
 	PVAL_SCHEMA_ENUM = 0xF,
 	PVAL_PANORAMA_PANEL_HANDLE = 0x10,
-	PVAL_COUNT = 0x11,
+	PVAL_TEST_HANDLE = 0x11,
+	PVAL_COUNT = 0x12,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/RenderBufferFlags_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/RenderBufferFlags_t.g.cs
@@ -20,4 +20,5 @@ public enum RenderBufferFlags_t : uint
 	RENDER_BUFFER_ACCELERATION_STRUCTURE = 0x200,
 	RENDER_BUFFER_SHADER_BINDING_TABLE = 0x400,
 	RENDER_BUFFER_PER_FRAME_WRITE_ONCE = 0x800,
+	RENDER_BUFFER_POOL_ALLOCATED = 0x1000,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/ScriptedMoveTo_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/ScriptedMoveTo_t.g.cs
@@ -8,10 +8,10 @@ namespace CounterStrikeSharp.API.Core;

 public enum ScriptedMoveTo_t : uint
 {
-	CINE_MOVETO_WAIT = 0x0,
-	CINE_MOVETO_WALK = 0x1,
-	CINE_MOVETO_RUN = 0x2,
-	CINE_MOVETO_CUSTOM = 0x3,
-	CINE_MOVETO_TELEPORT = 0x4,
-	CINE_MOVETO_WAIT_FACING = 0x5,
+	eWait = 0x0,
+	eMoveWithGait = 0x3,
+	eTeleport = 0x4,
+	eWaitFacing = 0x5,
+	eObsoleteBackCompat1 = 0x1,
+	eObsoleteBackCompat2 = 0x2,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/SoundFlags_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/SoundFlags_t.g.cs
@@ -6,29 +6,15 @@ using System;

 namespace CounterStrikeSharp.API.Core;

-public enum SoundFlags_t : uint
+public enum SoundFlags_t : ushort
 {
-	SOUND_NONE = 0x0,
-	SOUND_COMBAT = 0x1,
-	SOUND_WORLD = 0x2,
-	SOUND_PLAYER = 0x4,
-	SOUND_DANGER = 0x8,
-	SOUND_BULLET_IMPACT = 0x10,
-	SOUND_THUMPER = 0x20,
-	SOUND_PHYSICS_DANGER = 0x40,
-	SOUND_MOVE_AWAY = 0x80,
-	SOUND_PLAYER_VEHICLE = 0x100,
-	SOUND_GLASS_BREAK = 0x200,
-	SOUND_PHYSICS_OBJECT = 0x400,
-	SOUND_CONTEXT_GUNFIRE = 0x100000,
-	SOUND_CONTEXT_COMBINE_ONLY = 0x200000,
-	SOUND_CONTEXT_REACT_TO_SOURCE = 0x400000,
-	SOUND_CONTEXT_EXPLOSION = 0x800000,
-	SOUND_CONTEXT_EXCLUDE_COMBINE = 0x1000000,
-	SOUND_CONTEXT_DANGER_APPROACH = 0x2000000,
-	SOUND_CONTEXT_ALLIES_ONLY = 0x4000000,
-	SOUND_CONTEXT_PANIC_NPCS = 0x8000000,
-	ALL_CONTEXTS = 0xFFF00000,
-	ALL_SCENTS = 0x0,
-	ALL_SOUNDS = 0xFFFFF,
+	SOUND_FLAGS_NONE = 0x0,
+	SOUND_FLAG_GUNFIRE = 0x1,
+	SOUND_FLAG_COMBINE_ONLY = 0x2,
+	SOUND_FLAG_REACT_TO_SOURCE = 0x4,
+	SOUND_FLAG_EXPLOSION = 0x8,
+	SOUND_FLAG_EXCLUDE_COMBINE = 0x10,
+	SOUND_FLAG_DANGER_APPROACH = 0x20,
+	SOUND_FLAG_ALLIES_ONLY = 0x40,
+	SOUND_FLAG_PANIC_NPCS = 0x80,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/SoundTypes_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/SoundTypes_t.g.cs
@@ -0,0 +1,23 @@
+// <auto-generated />
+#nullable enable
+#pragma warning disable CS1591
+
+using System;
+
+namespace CounterStrikeSharp.API.Core;
+
+public enum SoundTypes_t : ushort
+{
+	SOUND_NONE = 0x0,
+	SOUND_COMBAT = 0x1,
+	SOUND_PLAYER = 0x2,
+	SOUND_DANGER = 0x3,
+	SOUND_BULLET_IMPACT = 0x4,
+	SOUND_THUMPER = 0x5,
+	SOUND_PHYSICS_DANGER = 0x6,
+	SOUND_MOVE_AWAY = 0x7,
+	SOUND_PLAYER_VEHICLE = 0x8,
+	SOUND_GLASS_BREAK = 0x9,
+	SOUND_PHYSICS_OBJECT = 0xA,
+	NUM_AI_SOUND_TYPES = 0xB,
+}
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/TakeDamageFlags_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/TakeDamageFlags_t.g.cs
@@ -6,7 +6,7 @@ using System;

 namespace CounterStrikeSharp.API.Core;

-public enum TakeDamageFlags_t : uint
+public enum TakeDamageFlags_t : ulong
 {
 	DFLAG_NONE = 0x0,
 	DFLAG_SUPPRESS_HEALTH_CHANGES = 0x1,
@@ -20,7 +20,8 @@ public enum TakeDamageFlags_t : uint
 	DFLAG_SUPPRESS_DAMAGE_MODIFICATION = 0x100,
 	DFLAG_ALWAYS_FIRE_DAMAGE_EVENTS = 0x200,
 	DFLAG_RADIUS_DMG = 0x400,
-	DMG_LASTDFLAG = 0x400,
-	DFLAG_IGNORE_ARMOR = 0x800,
-	DFLAG_SUPPRESS_UTILREMOVE = 0x1000,
+	DFLAG_FORCEREDUCEARMOR_DMG = 0x800,
+	DMG_LASTDFLAG = 0x800,
+	DFLAG_IGNORE_ARMOR = 0x1000,
+	DFLAG_SUPPRESS_UTILREMOVE = 0x2000,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/VMixProcessorType_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/VMixProcessorType_t.g.cs
@@ -9,33 +9,33 @@ namespace CounterStrikeSharp.API.Core;
 public enum VMixProcessorType_t : ushort
 {
 	VPROCESSOR_UNKNOWN = 0x0,
-	VPROCESSOR_STEAMAUDIO_REVERB = 0x1,
-	VPROCESSOR_RT_PITCH = 0x2,
-	VPROCESSOR_STEAMAUDIO_HRTF = 0x3,
-	VPROCESSOR_DYNAMICS = 0x4,
-	VPROCESSOR_PRESETDSP = 0x5,
-	VPROCESSOR_DELAY = 0x6,
-	VPROCESSOR_MOD_DELAY = 0x7,
-	VPROCESSOR_DIFFUSOR = 0x8,
-	VPROCESSOR_BOXVERB = 0x9,
-	VPROCESSOR_FREEVERB = 0xA,
-	VPROCESSOR_PLATEVERB = 0xB,
-	VPROCESSOR_FULLWAVE_INTEGRATOR = 0xC,
-	VPROCESSOR_FILTER = 0xD,
-	VPROCESSOR_STEAMAUDIO_PATHING = 0xE,
-	VPROCESSOR_EQ8 = 0xF,
-	VPROCESSOR_ENVELOPE = 0x10,
-	VPROCESSOR_VOCODER = 0x11,
-	VPROCESSOR_CONVOLUTION = 0x12,
-	VPROCESSOR_DYNAMICS_3BAND = 0x13,
-	VPROCESSOR_DYNAMICS_COMPRESSOR = 0x14,
-	VPROCESSOR_SHAPER = 0x15,
-	VPROCESSOR_PANNER = 0x16,
-	VPROCESSOR_UTILITY = 0x17,
-	VPROCESSOR_AUTOFILTER = 0x18,
-	VPROCESSOR_OSC = 0x19,
-	VPROCESSOR_STEREODELAY = 0x1A,
-	VPROCESSOR_EFFECT_CHAIN = 0x1B,
-	VPROCESSOR_SUBGRAPH_SWITCH = 0x1C,
-	VPROCESSOR_STEAMAUDIO_DIRECT = 0x1D,
+	VPROCESSOR_RT_PITCH = 0x1,
+	VPROCESSOR_STEAMAUDIO_HRTF = 0x2,
+	VPROCESSOR_DYNAMICS = 0x3,
+	VPROCESSOR_PRESETDSP = 0x4,
+	VPROCESSOR_DELAY = 0x5,
+	VPROCESSOR_MOD_DELAY = 0x6,
+	VPROCESSOR_DIFFUSOR = 0x7,
+	VPROCESSOR_BOXVERB = 0x8,
+	VPROCESSOR_FREEVERB = 0x9,
+	VPROCESSOR_PLATEVERB = 0xA,
+	VPROCESSOR_FULLWAVE_INTEGRATOR = 0xB,
+	VPROCESSOR_FILTER = 0xC,
+	VPROCESSOR_STEAMAUDIO_PATHING = 0xD,
+	VPROCESSOR_EQ8 = 0xE,
+	VPROCESSOR_ENVELOPE = 0xF,
+	VPROCESSOR_VOCODER = 0x10,
+	VPROCESSOR_CONVOLUTION = 0x11,
+	VPROCESSOR_DYNAMICS_3BAND = 0x12,
+	VPROCESSOR_DYNAMICS_COMPRESSOR = 0x13,
+	VPROCESSOR_SHAPER = 0x14,
+	VPROCESSOR_PANNER = 0x15,
+	VPROCESSOR_UTILITY = 0x16,
+	VPROCESSOR_AUTOFILTER = 0x17,
+	VPROCESSOR_OSC = 0x18,
+	VPROCESSOR_STEREODELAY = 0x19,
+	VPROCESSOR_EFFECT_CHAIN = 0x1A,
+	VPROCESSOR_SUBGRAPH_SWITCH = 0x1B,
+	VPROCESSOR_STEAMAUDIO_DIRECT = 0x1C,
+	VPROCESSOR_STEAMAUDIO_HYBRIDREVERB = 0x1D,
 }
--- a/managed/CounterStrikeSharp.API/Core/Schema/Enums/loadout_slot_t.g.cs
+++ b/managed/CounterStrikeSharp.API/Core/Schema/Enums/loadout_slot_t.g.cs
@@ -59,7 +59,7 @@ public enum loadout_slot_t : uint
 	LOADOUT_SLOT_FIRST_WHEEL_EQUIPMENT = 0x20,
 	LOADOUT_SLOT_LAST_WHEEL_EQUIPMENT = 0x25,
 	LOADOUT_SLOT_CLOTHING_CUSTOMPLAYER = 0x26,
-	LOADOUT_SLOT_PET = 0x27,
+	LOADOUT_SLOT_CLOTHING_CUSTOMHEAD = 0x27,
 	LOADOUT_SLOT_CLOTHING_FACEMASK = 0x28,
 	LOADOUT_SLOT_CLOTHING_HANDS = 0x29,
 	LOADOUT_SLOT_FIRST_COSMETIC = 0x29,
--- a/managed/CounterStrikeSharp.SchemaGen/Program.cs
+++ b/managed/CounterStrikeSharp.SchemaGen/Program.cs
@@ -29,7 +29,9 @@ internal static partial class Program
        "SpawnPointCoopEnemy::BotDefaultBehavior_t",
        "CLogicBranchList::LogicBranchListenerLastState_t",
        "SimpleConstraintSoundProfile::SimpleConstraintsSoundProfileKeypoints_t",
-        "MoodAnimationLayer_t"
+        "MoodAnimationLayer_t",
+        "SoundeventPathCornerPairNetworked_t",
+        "AISound_t"
    };

    private static readonly IReadOnlySet<string> IgnoreClassWildcards = new HashSet<string>
@@ -292,6 +294,7 @@ internal static partial class Program
                builder.AppendLine($"\t}}");
                builder.AppendLine();
            }
+
            if (field.Type is { Category: SchemaTypeCategory.FixedArray, CsTypeName: "string" })
            {
                var getter = $"return Schema.GetString({handleParams});";
--- a/managed/CounterStrikeSharp.SchemaGen/Schema/server.json
+++ b/managed/CounterStrikeSharp.SchemaGen/Schema/server.json
--- a/src/core/globals.cpp
+++ b/src/core/globals.cpp
@@ -1,3 +1,4 @@
+// clang-format off
 #include "mm_plugin.h"
 #include "core/globals.h"
 #include "core/managers/player_manager.h"
@@ -25,6 +26,9 @@
 #include <public/game/server/iplayerinfo.h>
 #include <public/entity2/entitysystem.h>

+#include <funchook.h>
+// clang-format on
+
 namespace counterstrikesharp {

 namespace modules {
@@ -37,6 +41,7 @@ CModule* vscript = nullptr;
 } // namespace modules

 namespace globals {
+IVEngineServer2* engineServer2 = nullptr;
 IVEngineServer* engine = nullptr;
 IGameEventManager2* gameEventManager = nullptr;
 IGameEventSystem* gameEventSystem = nullptr;
@@ -86,6 +91,7 @@ TickScheduler tickScheduler;

 bool gameLoopInitialized = false;
 GetLegacyGameEventListener_t* GetLegacyGameEventListener = nullptr;
+GameEventManagerInit_t* GameEventManagerInit = nullptr;
 std::thread::id gameThreadId;

 // Based on 64 fixed tick rate
@@ -105,25 +111,34 @@ void Initialize()

    entitySystem = interfaces::pGameResourceServiceServer->GetGameEntitySystem();

-    GetLegacyGameEventListener = reinterpret_cast<GetLegacyGameEventListener_t*>(modules::server->FindSignature(
-            globals::gameConfig->GetSignature("LegacyGameEventListener")));
+    GetLegacyGameEventListener = reinterpret_cast<GetLegacyGameEventListener_t*>(
+        modules::server->FindSignature(globals::gameConfig->GetSignature("LegacyGameEventListener")));

-    if (int offset = -1; (offset = gameConfig->GetOffset("GameEventManager")) != -1) {
-        gameEventManager = (IGameEventManager2*)(CALL_VIRTUAL(uintptr_t, offset, server) - 8);
+    GameEventManagerInit = reinterpret_cast<GameEventManagerInit_t*>(
+        modules::server->FindSignature(globals::gameConfig->GetSignature("CGameEventManager_Init")));
+
+    if (GameEventManagerInit == nullptr)
+    {
+        CSSHARP_CORE_ERROR("Failed to find signature for \'GameEventManagerInit\'");
+        return;
    }
+
+    auto m_hook = funchook_create();
+    funchook_prepare(m_hook, (void**)&GameEventManagerInit, (void*)&DetourGameEventManagerInit);
+    funchook_install(m_hook, 0);
+}
+
+void DetourGameEventManagerInit(IGameEventManager2* pGameEventManager)
+{
+    gameEventManager = pGameEventManager;
+
+    GameEventManagerInit(pGameEventManager);
+
+    eventManager.OnAllInitialized_Post();
 }

 int source_hook_pluginid = 0;
-CGlobalVars* getGlobalVars()
-{
-    INetworkGameServer* server = networkServerService->GetIGameServer();
-
-    if (!server) {
-        return nullptr;
-    }
-
-    return networkServerService->GetIGameServer()->GetGlobals();
-}
+CGlobalVars* getGlobalVars() { return engineServer2->GetServerGlobals(); }

 } // namespace globals
 } // namespace counterstrikesharp
--- a/src/core/globals.h
+++ b/src/core/globals.h
@@ -1,7 +1,7 @@
 #pragma once

 #define protected public
-#define private public
+#define private   public
 #include <tier1/convar.h>
 #undef protected
 #undef private
@@ -63,34 +63,35 @@ class CGameConfig;

 namespace globals {

-extern IVEngineServer *engine;
-extern IGameEventManager2 *gameEventManager;
-extern IPlayerInfoManager *playerinfoManager;
-extern IBotManager *botManager;
-extern IServerPluginHelpers *helpers;
-extern IUniformRandomStream *randomStream;
-extern IEngineTrace *engineTrace;
-extern IEngineSound *engineSound;
-extern IEngineServiceMgr *engineServiceManager;
-extern INetworkStringTableContainer *netStringTables;
-extern CGlobalVars *globalVars;
-extern IFileSystem *fileSystem;
-extern IServerGameDLL *serverGameDll;
-extern IServerGameClients *serverGameClients;
-extern INetworkServerService *networkServerService;
-extern CSchemaSystem *schemaSystem;
-extern IServerTools *serverTools;
-extern IPhysics *physics;
-extern IPhysicsCollision *physicsCollision;
-extern IPhysicsSurfaceProps *physicsSurfaceProps;
-extern IMDLCache *modelCache;
-extern IVoiceServer *voiceServer;
+extern IVEngineServer* engine;
+extern IVEngineServer2* engineServer2;
+extern IGameEventManager2* gameEventManager;
+extern IPlayerInfoManager* playerinfoManager;
+extern IBotManager* botManager;
+extern IServerPluginHelpers* helpers;
+extern IUniformRandomStream* randomStream;
+extern IEngineTrace* engineTrace;
+extern IEngineSound* engineSound;
+extern IEngineServiceMgr* engineServiceManager;
+extern INetworkStringTableContainer* netStringTables;
+extern CGlobalVars* globalVars;
+extern IFileSystem* fileSystem;
+extern IServerGameDLL* serverGameDll;
+extern IServerGameClients* serverGameClients;
+extern INetworkServerService* networkServerService;
+extern CSchemaSystem* schemaSystem;
+extern IServerTools* serverTools;
+extern IPhysics* physics;
+extern IPhysicsCollision* physicsCollision;
+extern IPhysicsSurfaceProps* physicsSurfaceProps;
+extern IMDLCache* modelCache;
+extern IVoiceServer* voiceServer;
 extern CDotNetManager dotnetManager;
-extern ICvar *cvars;
-extern ISource2Server *server;
-extern CGlobalEntityList *globalEntityList;
+extern ICvar* cvars;
+extern ISource2Server* server;
+extern CGlobalEntityList* globalEntityList;
 extern EntityListener entityListener;
-extern CGameEntitySystem *entitySystem;
+extern CGameEntitySystem* entitySystem;

 extern EventManager eventManager;
 extern UserMessageManager userMessageManager;
@@ -108,17 +109,20 @@ extern VoiceManager voiceManager;
 extern TickScheduler tickScheduler;

 extern HookManager hookManager;
-extern SourceHook::ISourceHook *source_hook;
+extern SourceHook::ISourceHook* source_hook;
 extern int source_hook_pluginid;
-extern IGameEventSystem *gameEventSystem;
-extern CounterStrikeSharpMMPlugin *mmPlugin;
-extern ISmmAPI *ismm;
+extern IGameEventSystem* gameEventSystem;
+extern CounterStrikeSharpMMPlugin* mmPlugin;
+extern ISmmAPI* ismm;
 extern CCoreConfig* coreConfig;
 extern CGameConfig* gameConfig;

 extern const float engine_fixed_tick_interval;

-typedef IGameEventListener2 *GetLegacyGameEventListener_t(CPlayerSlot slot);
+typedef void GameEventManagerInit_t(IGameEventManager2* gameEventManager);
+typedef IGameEventListener2* GetLegacyGameEventListener_t(CPlayerSlot slot);
+
+static void DetourGameEventManagerInit(IGameEventManager2* gameEventManager);

 extern bool gameLoopInitialized;
 extern GetLegacyGameEventListener_t* GetLegacyGameEventListener;
@@ -127,8 +131,8 @@ extern std::thread::id gameThreadId;
 void Initialize();
 // Should only be called within the active game loop (i e map should be loaded
 // and active) otherwise that'll be nullptr!
-CGlobalVars *getGlobalVars();
-}  // namespace globals
+CGlobalVars* getGlobalVars();
+} // namespace globals

 namespace modules {
 class CModule;
@@ -138,14 +142,14 @@ CModule* GetModuleByName(std::string name);

 extern std::vector<std::unique_ptr<CModule>> moduleList;

-extern CModule *engine;
-extern CModule *tier0;
-extern CModule *server;
-extern CModule *schemasystem;
-extern CModule *vscript;
-}  // namespace modules
+extern CModule* engine;
+extern CModule* tier0;
+extern CModule* server;
+extern CModule* schemasystem;
+extern CModule* vscript;
+} // namespace modules

-}  // namespace counterstrikesharp
+} // namespace counterstrikesharp

 #undef SH_GLOB_SHPTR
 #define SH_GLOB_SHPTR counterstrikesharp::globals::source_hook
--- a/src/core/managers/chat_manager.cpp
+++ b/src/core/managers/chat_manager.cpp
@@ -15,21 +15,19 @@
 */

 #include "core/managers/chat_manager.h"
-#include "core/managers/con_command_manager.h"
-#include "scripting/callback_manager.h"
-#include "characterset.h"
-
-#include <igameevents.h>
-#include <baseentity.h>
-#include <public/eiface.h>
-#include "core/memory.h"
-#include "core/log.h"
-#include "core/coreconfig.h"
-#include "core/gameconfig.h"

 #include <funchook.h>
+#include <igameevents.h>
+#include <public/eiface.h>

+#include "characterset.h"
+#include "core/coreconfig.h"
+#include "core/gameconfig.h"
+#include "core/log.h"
+#include "core/managers/con_command_manager.h"
+#include "core/memory.h"
 #include "core/memory_module.h"
+#include "scripting/callback_manager.h"

 namespace counterstrikesharp {

@@ -39,10 +37,10 @@ ChatManager::~ChatManager() {}

 void ChatManager::OnAllInitialized()
 {
-    m_pHostSay = reinterpret_cast<HostSay>(
-        modules::server->FindSignature(globals::gameConfig->GetSignature("Host_Say")));
+    m_pHostSay = reinterpret_cast<HostSay>(modules::server->FindSignature(globals::gameConfig->GetSignature("Host_Say")));

-    if (m_pHostSay == nullptr) {
+    if (m_pHostSay == nullptr)
+    {
        CSSHARP_CORE_ERROR("Failed to find signature for \'Host_Say\'");
        return;
    }
@@ -54,12 +52,13 @@ void ChatManager::OnAllInitialized()

 void ChatManager::OnShutdown() {}

-void DetourHostSay(CBaseEntity* pController, CCommand& args, bool teamonly, int unk1,
-                   const char* unk2)
+void DetourHostSay(CEntityInstance* pController, CCommand& args, bool teamonly, int unk1, const char* unk2)
 {
-    if (pController) {
+    if (pController)
+    {
        auto pEvent = globals::gameEventManager->CreateEvent("player_chat", true);
-        if (pEvent) {
+        if (pEvent)
+        {
            pEvent->SetBool("teamonly", teamonly);
            pEvent->SetInt("userid", pController->GetEntityIndex().Get() - 1);
            pEvent->SetString("text", args[1]);
@@ -72,17 +71,17 @@ void DetourHostSay(CBaseEntity* pController, CCommand& args, bool teamonly, int
    bool bSilent = globals::coreConfig->IsSilentChatTrigger(args[1], prefix);
    bool bCommand = globals::coreConfig->IsPublicChatTrigger(args[1], prefix) || bSilent;

-    if (!bSilent) {
+    if (!bSilent)
+    {
        m_pHostSay(pController, args, teamonly, unk1, unk2);
    }

    if (bCommand)
    {
-        char *pszMessage = (char *)(args.ArgS() + prefix.length() + 1);
+        char* pszMessage = (char*)(args.ArgS() + prefix.length() + 1);

        // Trailing slashes are only removed if Host_Say has been called.
-        if (bSilent)
-            pszMessage[V_strlen(pszMessage) - 1] = 0;
+        if (bSilent) pszMessage[V_strlen(pszMessage) - 1] = 0;

        CCommand args;
        args.Tokenize(pszMessage);
@@ -90,7 +89,8 @@ void DetourHostSay(CBaseEntity* pController, CCommand& args, bool teamonly, int
        auto prefixedPhrase = std::string("css_") + args.Arg(0);
        auto bValidWithPrefix = globals::conCommandManager.IsValidValveCommand(prefixedPhrase.c_str());

-        if (bValidWithPrefix) {
+        if (bValidWithPrefix)
+        {
            // Re-tokenize with a `css_` prefix if we have found that its a valid command.
            args.Tokenize(("css_" + std::string(pszMessage)).c_str());
        }
@@ -99,30 +99,29 @@ void DetourHostSay(CBaseEntity* pController, CCommand& args, bool teamonly, int
    }
 }

-bool ChatManager::OnSayCommandPre(CBaseEntity* pController, CCommand& command) { return false; }
+bool ChatManager::OnSayCommandPre(CEntityInstance* pController, CCommand& command) { return false; }

-void ChatManager::OnSayCommandPost(CBaseEntity* pController, CCommand& command)
+void ChatManager::OnSayCommandPost(CEntityInstance* pController, CCommand& command)
 {
    auto commandStr = command.Arg(0);

    return InternalDispatch(pController, commandStr, command);
 }

-void ChatManager::InternalDispatch(CBaseEntity* pPlayerController, const char* szTriggerPhase,
-                                   CCommand& fullCommand)
+void ChatManager::InternalDispatch(CEntityInstance* pPlayerController, const char* szTriggerPhase, CCommand& fullCommand)
 {
-    if (pPlayerController == nullptr) {
-        globals::conCommandManager.ExecuteCommandCallbacks(
-            fullCommand.Arg(0), CCommandContext(CommandTarget_t::CT_NO_TARGET, CPlayerSlot(-1)),
-            fullCommand, HookMode::Pre, CommandCallingContext::Chat);
+    if (pPlayerController == nullptr)
+    {
+        globals::conCommandManager.ExecuteCommandCallbacks(fullCommand.Arg(0),
+                                                           CCommandContext(CommandTarget_t::CT_NO_TARGET, CPlayerSlot(-1)), fullCommand,
+                                                           HookMode::Pre, CommandCallingContext::Chat);
        return;
    }

    auto index = pPlayerController->GetEntityIndex().Get();
    auto slot = CPlayerSlot(index - 1);

-    globals::conCommandManager.ExecuteCommandCallbacks(
-        fullCommand.Arg(0), CCommandContext(CommandTarget_t::CT_NO_TARGET, slot), fullCommand,
-        HookMode::Pre, CommandCallingContext::Chat);
+    globals::conCommandManager.ExecuteCommandCallbacks(fullCommand.Arg(0), CCommandContext(CommandTarget_t::CT_NO_TARGET, slot),
+                                                       fullCommand, HookMode::Pre, CommandCallingContext::Chat);
 }
-} // namespace counterstrikesharp
+} // namespace counterstrikesharp
--- a/src/core/managers/chat_manager.h
+++ b/src/core/managers/chat_manager.h
@@ -19,14 +19,14 @@
 #include <map>
 #include <vector>

-#include "core/globals.h"
 #include "core/global_listener.h"
+#include "core/globals.h"
 #include "scripting/script_engine.h"

 namespace counterstrikesharp {
 class ScriptCallback;

-typedef void (*HostSay)(CBaseEntity*, CCommand&, bool, int, const char*);
+typedef void (*HostSay)(CEntityInstance*, CCommand&, bool, int, const char*);

 class ChatCommandInfo
 {
@@ -52,18 +52,17 @@ class ChatManager : public GlobalClass
    void OnAllInitialized() override;
    void OnShutdown() override;

-    bool OnSayCommandPre(CBaseEntity* pController, CCommand& args);
-    void OnSayCommandPost(CBaseEntity* pController, CCommand& args);
+    bool OnSayCommandPre(CEntityInstance* pController, CCommand& args);
+    void OnSayCommandPost(CEntityInstance* pController, CCommand& args);
+
  private:
-    void InternalDispatch(CBaseEntity* pPlayerController, const char* szTriggerPhrase,
-                          CCommand& pFullCommand);
+    void InternalDispatch(CEntityInstance* pPlayerController, const char* szTriggerPhrase, CCommand& pFullCommand);

    std::vector<ChatCommandInfo*> m_cmd_list;
    std::map<std::string, ChatCommandInfo*> m_cmd_lookup;
 };

-static void DetourHostSay(CBaseEntity* pController, CCommand& args, bool teamonly, int unk1,
-                          const char* unk2);
+static void DetourHostSay(CEntityInstance* pController, CCommand& args, bool teamonly, int unk1, const char* unk2);
 static HostSay m_pHostSay = nullptr;

-} // namespace counterstrikesharp
+} // namespace counterstrikesharp
--- a/src/core/managers/event_manager.cpp
+++ b/src/core/managers/event_manager.cpp
@@ -46,27 +46,26 @@ void EventManager::OnStartup() {}

 void EventManager::OnGameLoopInitialized()
 {
-    while (!m_PendingHooks.empty()) {
+    while (!m_PendingHooks.empty())
+    {
        const auto& pendingHook = m_PendingHooks.top();
        HookEvent(pendingHook.m_Name.c_str(), pendingHook.m_fnCallback, pendingHook.m_bPost);
        m_PendingHooks.pop();
    }
 }

-void EventManager::OnAllInitialized()
+void EventManager::OnAllInitialized() {}
+
+void EventManager::OnAllInitialized_Post()
 {
-    SH_ADD_HOOK(IGameEventManager2, FireEvent, globals::gameEventManager,
-                SH_MEMBER(this, &EventManager::OnFireEvent), false);
-    SH_ADD_HOOK(IGameEventManager2, FireEvent, globals::gameEventManager,
-                SH_MEMBER(this, &EventManager::OnFireEventPost), true);
+    SH_ADD_HOOK(IGameEventManager2, FireEvent, globals::gameEventManager, SH_MEMBER(this, &EventManager::OnFireEvent), false);
+    SH_ADD_HOOK(IGameEventManager2, FireEvent, globals::gameEventManager, SH_MEMBER(this, &EventManager::OnFireEventPost), true);
 }

 void EventManager::OnShutdown()
 {
-    SH_REMOVE_HOOK(IGameEventManager2, FireEvent, globals::gameEventManager,
-                   SH_MEMBER(this, &EventManager::OnFireEvent), false);
-    SH_REMOVE_HOOK(IGameEventManager2, FireEvent, globals::gameEventManager,
-                   SH_MEMBER(this, &EventManager::OnFireEventPost), true);
+    SH_REMOVE_HOOK(IGameEventManager2, FireEvent, globals::gameEventManager, SH_MEMBER(this, &EventManager::OnFireEvent), false);
+    SH_REMOVE_HOOK(IGameEventManager2, FireEvent, globals::gameEventManager, SH_MEMBER(this, &EventManager::OnFireEventPost), true);

    globals::gameEventManager->RemoveListener(this);
 }
@@ -79,28 +78,33 @@ bool EventManager::HookEvent(const char* szName, CallbackT fnCallback, bool bPos

    // Plugin load is called before game loop (and thus events file is loaded)
    // So we defer hooking until game loop is initialized
-    if (!globals::gameLoopInitialized) {
-        const PendingEventHook pendingHook{szName, fnCallback, bPost};
+    if (!globals::gameLoopInitialized)
+    {
+        const PendingEventHook pendingHook{ szName, fnCallback, bPost };
        m_PendingHooks.push(pendingHook);
        return true;
    }

-    CSSHARP_CORE_TRACE("[EventManager] Hooking event: {0} with callback pointer: {1}", szName,
-                       (void*)fnCallback);
+    CSSHARP_CORE_TRACE("[EventManager] Hooking event: {0} with callback pointer: {1}", szName, (void*)fnCallback);

-    if (!globals::gameEventManager->FindListener(this, szName)) {
+    if (!globals::gameEventManager->FindListener(this, szName))
+    {
        globals::gameEventManager->AddListener(this, szName, true);
    }

    auto search = m_hooksMap.find(szName);
    // If hook struct is not found
-    if (search == m_hooksMap.end()) {
+    if (search == m_hooksMap.end())
+    {
        pHook = new EventHook();

-        if (bPost) {
+        if (bPost)
+        {
            pHook->m_pPostHook = globals::callbackManager.CreateCallback(szName);
            pHook->m_pPostHook->AddListener(fnCallback);
-        } else {
+        }
+        else
+        {
            pHook->m_pPreHook = globals::callbackManager.CreateCallback(szName);
            pHook->m_pPreHook->AddListener(fnCallback);
        }
@@ -110,18 +114,25 @@ bool EventManager::HookEvent(const char* szName, CallbackT fnCallback, bool bPos
        m_hooksMap[szName] = pHook;

        return true;
-    } else {
+    }
+    else
+    {
        pHook = search->second;
    }

-    if (bPost) {
-        if (!pHook->m_pPostHook) {
+    if (bPost)
+    {
+        if (!pHook->m_pPostHook)
+        {
            pHook->m_pPostHook = globals::callbackManager.CreateCallback("");
        }

        pHook->m_pPostHook->AddListener(fnCallback);
-    } else {
-        if (!pHook->m_pPreHook) {
+    }
+    else
+    {
+        if (!pHook->m_pPreHook)
+        {
            pHook->m_pPreHook = globals::callbackManager.CreateCallback("");
        }

@@ -137,26 +148,34 @@ bool EventManager::UnhookEvent(const char* szName, CallbackT fnCallback, bool bP
    ScriptCallback* pCallback;

    auto search = m_hooksMap.find(szName);
-    if (search == m_hooksMap.end()) {
+    if (search == m_hooksMap.end())
+    {
        return false;
    }

    pHook = search->second;

-    if (bPost) {
+    if (bPost)
+    {
        pCallback = pHook->m_pPostHook;
-    } else {
+    }
+    else
+    {
        pCallback = pHook->m_pPreHook;
    }

    pCallback->RemoveListener(fnCallback);

-    if (pCallback->GetFunctionCount() == 0) {
+    if (pCallback->GetFunctionCount() == 0)
+    {
        globals::callbackManager.ReleaseCallback(pCallback);

-        if (bPost) {
+        if (bPost)
+        {
            pHook->m_pPostHook = nullptr;
-        } else {
+        }
+        else
+        {
            pHook->m_pPreHook = nullptr;
        }
    }
@@ -168,7 +187,8 @@ bool EventManager::UnhookEvent(const char* szName, CallbackT fnCallback, bool bP

 bool EventManager::OnFireEvent(IGameEvent* pEvent, bool bDontBroadcast)
 {
-    if (!pEvent) {
+    if (!pEvent)
+    {
        RETURN_META_VALUE(MRES_IGNORED, false);
    }

@@ -176,28 +196,31 @@ bool EventManager::OnFireEvent(IGameEvent* pEvent, bool bDontBroadcast)
    bool bLocalDontBroadcast = bDontBroadcast;
    auto I = m_hooksMap.find(szName);

-    if (I != m_hooksMap.end()) {
+    if (I != m_hooksMap.end())
+    {
        auto pEventHook = I->second;
        m_EventStack.push(pEventHook);
        auto* pCallback = pEventHook->m_pPreHook;

-        if (pCallback) {
-            CSSHARP_CORE_TRACE("Pushing event `{}` pointer: {}, dont broadcast: {}, post: {}",
-                              szName, (void*)pEvent, bDontBroadcast, false);
-            EventOverride override = {bDontBroadcast};
+        if (pCallback)
+        {
+            CSSHARP_CORE_TRACE("Pushing event `{}` pointer: {}, dont broadcast: {}, post: {}", szName, (void*)pEvent, bDontBroadcast,
+                               false);
+            EventOverride override = { bDontBroadcast };
            pCallback->Reset();
            pCallback->ScriptContext().Push(pEvent);
            pCallback->ScriptContext().Push(&override);

-            for (auto fnMethodToCall : pCallback->GetFunctions()) {
-                if (!fnMethodToCall)
-                    continue;
+            for (auto fnMethodToCall : pCallback->GetFunctions())
+            {
+                if (!fnMethodToCall) continue;
                fnMethodToCall(&pCallback->ScriptContextStruct());

                auto result = pCallback->ScriptContext().GetResult<HookResult>();
                bLocalDontBroadcast = override.m_bDontBroadcast;

-                if (result >= HookResult::Handled) {
+                if (result >= HookResult::Handled)
+                {
                    m_EventCopies.push(globals::gameEventManager->DuplicateEvent(pEvent));
                    globals::gameEventManager->FreeEvent(pEvent);
                    RETURN_META_VALUE(MRES_SUPERCEDE, false);
@@ -205,13 +228,15 @@ bool EventManager::OnFireEvent(IGameEvent* pEvent, bool bDontBroadcast)
            }
        }
        m_EventCopies.push(globals::gameEventManager->DuplicateEvent(pEvent));
-    } else {
+    }
+    else
+    {
        m_EventStack.push(nullptr);
    }

-    if (bLocalDontBroadcast != bDontBroadcast) {
-        RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, true, &IGameEventManager2::FireEvent,
-                                    (pEvent, bLocalDontBroadcast));
+    if (bLocalDontBroadcast != bDontBroadcast)
+    {
+        RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, true, &IGameEventManager2::FireEvent, (pEvent, bLocalDontBroadcast));
    }

    RETURN_META_VALUE(MRES_IGNORED, true);
@@ -219,20 +244,23 @@ bool EventManager::OnFireEvent(IGameEvent* pEvent, bool bDontBroadcast)

 bool EventManager::OnFireEventPost(IGameEvent* pEvent, bool bDontBroadcast)
 {
-    if (!pEvent) {
+    if (!pEvent)
+    {
        RETURN_META_VALUE(MRES_IGNORED, false);
    }

    auto pHook = m_EventStack.top();

-    if (pHook) {
+    if (pHook)
+    {
        auto* pCallback = pHook->m_pPostHook;

-        if (pCallback) {
+        if (pCallback)
+        {
            auto pEventCopy = m_EventCopies.top();
-            CSSHARP_CORE_TRACE("Pushing event `{}` pointer: {}, dont broadcast: {}, post: {}",
-                              pEventCopy->GetName(), (void*)pEventCopy, bDontBroadcast, true);
-            EventOverride override = {bDontBroadcast};
+            CSSHARP_CORE_TRACE("Pushing event `{}` pointer: {}, dont broadcast: {}, post: {}", pEventCopy->GetName(), (void*)pEventCopy,
+                               bDontBroadcast, true);
+            EventOverride override = { bDontBroadcast };
            pCallback->Reset();
            pCallback->ScriptContext().Push(pEventCopy);
            pCallback->ScriptContext().Push(&override);
--- a/src/core/managers/event_manager.h
+++ b/src/core/managers/event_manager.h
@@ -37,15 +37,13 @@ class CUtlString;
 #include <public/igameevents.h>

 #include <map>
-#include <string>
 #include <stack>
+#include <string>

 #include "core/global_listener.h"
 #include "core/globals.h"
 #include "scripting/script_engine.h"

-
-
 namespace counterstrikesharp {
 class ScriptCallback;
 class PluginFunction;
@@ -63,11 +61,13 @@ struct EventHook
    std::string m_Name;
 };

-struct EventOverride {
-  bool m_bDontBroadcast;
+struct EventOverride
+{
+    bool m_bDontBroadcast;
 };

-struct PendingEventHook {
+struct PendingEventHook
+{
    std::string m_Name;
    counterstrikesharp::CallbackT m_fnCallback;
    bool m_bPost;
@@ -84,6 +84,7 @@ class EventManager : public IGameEventListener2, public GlobalClass
    // GlobalClass
    void OnShutdown() override;
    void OnAllInitialized() override;
+    void OnAllInitialized_Post() override;
    void OnStartup() override;
    void OnGameLoopInitialized() override;

@@ -99,8 +100,8 @@ class EventManager : public IGameEventListener2, public GlobalClass

    std::map<std::string, EventHook*> m_hooksMap;

-    std::stack<EventHook *> m_EventStack;
-    std::stack<IGameEvent *> m_EventCopies;
+    std::stack<EventHook*> m_EventStack;
+    std::stack<IGameEvent*> m_EventCopies;
    std::stack<PendingEventHook> m_PendingHooks;
 };

--- a/src/core/managers/voice_manager.cpp
+++ b/src/core/managers/voice_manager.cpp
@@ -15,15 +15,15 @@
 */

 #include "core/managers/voice_manager.h"
-#include "core/managers/player_manager.h"

-#include <public/eiface.h>
-#include "scripting/callback_manager.h"
-#include <schema.h>
 #include <entity2/entitysystem.h>
+#include <public/eiface.h>
+#include <schema.h>

-SH_DECL_HOOK3(IVEngineServer2, SetClientListening, SH_NOATTRIB, 0, bool, CPlayerSlot, CPlayerSlot,
-                   bool);
+#include "core/managers/player_manager.h"
+#include "scripting/callback_manager.h"
+
+SH_DECL_HOOK3(IVEngineServer2, SetClientListening, SH_NOATTRIB, 0, bool, CPlayerSlot, CPlayerSlot, bool);

 namespace counterstrikesharp {

@@ -33,14 +33,12 @@ VoiceManager::~VoiceManager() {}

 void VoiceManager::OnAllInitialized()
 {
-    SH_ADD_HOOK(IVEngineServer2, SetClientListening, globals::engine,
-                SH_MEMBER(this, &VoiceManager::SetClientListening), false);
+    SH_ADD_HOOK(IVEngineServer2, SetClientListening, globals::engine, SH_MEMBER(this, &VoiceManager::SetClientListening), false);
 }

 void VoiceManager::OnShutdown()
 {
-    SH_REMOVE_HOOK(IVEngineServer2, SetClientListening, globals::engine,
-                   SH_MEMBER(this, &VoiceManager::SetClientListening), false);
+    SH_REMOVE_HOOK(IVEngineServer2, SetClientListening, globals::engine, SH_MEMBER(this, &VoiceManager::SetClientListening), false);
 }

 bool VoiceManager::SetClientListening(CPlayerSlot iReceiver, CPlayerSlot iSender, bool bListen)
@@ -56,49 +54,44 @@ bool VoiceManager::SetClientListening(CPlayerSlot iReceiver, CPlayerSlot iSender

        if (pReceiver->m_selfMutes->Get(iSender.Get()))
        {
-            RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening,
-                                        (iReceiver, iSender, false));
+            RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening, (iReceiver, iSender, false));
        }

        if (senderFlags & Speak_Muted)
        {
-            RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening,
-                                        (iReceiver, iSender, false));
-        }
-        
-        if (listenOverride == Listen_Mute)
-        {
-            RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening,
-                                        (iReceiver, iSender, false));
-        } else if (listenOverride == Listen_Hear) {
-            RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening,
-                                        (iReceiver, iSender, true));
+            RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening, (iReceiver, iSender, false));
        }

-        if ((senderFlags & Speak_All) || (receiverFlags & Speak_ListenAll)) {
-            RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening,
-                                        (iReceiver, iSender, true));
+        if (listenOverride == Listen_Mute)
+        {
+            RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening, (iReceiver, iSender, false));
        }
-        
+        else if (listenOverride == Listen_Hear)
+        {
+            RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening, (iReceiver, iSender, true));
+        }
+
+        if ((senderFlags & Speak_All) || (receiverFlags & Speak_ListenAll))
+        {
+            RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening, (iReceiver, iSender, true));
+        }
+
        if ((senderFlags & Speak_Team) || (receiverFlags & Speak_ListenTeam))
        {
            static auto classKey = hash_32_fnv1a_const("CBaseEntity");
            static auto memberKey = hash_32_fnv1a_const("m_iTeamNum");
            const static auto m_key = schema::GetOffset("CBaseEntity", classKey, "m_iTeamNum", memberKey);

-            auto receiverController = globals::entitySystem->GetBaseEntity(CEntityIndex(iReceiver.Get() + 1));
-            auto senderController = globals::entitySystem->GetBaseEntity(CEntityIndex(iSender.Get() + 1));
+            auto receiverController = globals::entitySystem->GetEntityInstance(CEntityIndex(iReceiver.Get() + 1));
+            auto senderController = globals::entitySystem->GetEntityInstance(CEntityIndex(iSender.Get() + 1));

            if (receiverController && senderController)
            {
-                auto receiverTeam = *reinterpret_cast<std::add_pointer_t<unsigned int>>(
-                    (uintptr_t)(receiverController) + m_key.offset);
+                auto receiverTeam = *reinterpret_cast<std::add_pointer_t<unsigned int>>((uintptr_t)(receiverController) + m_key.offset);

-                auto senderTeam = *reinterpret_cast<std::add_pointer_t<unsigned int>>(
-                    (uintptr_t)(senderController) + m_key.offset);
+                auto senderTeam = *reinterpret_cast<std::add_pointer_t<unsigned int>>((uintptr_t)(senderController) + m_key.offset);

-                RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen,
-                                            &IVEngineServer2::SetClientListening,
+                RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, bListen, &IVEngineServer2::SetClientListening,
                                            (iReceiver, iSender, receiverTeam == senderTeam));
            }
        }
@@ -111,19 +104,18 @@ void VoiceManager::OnClientCommand(CPlayerSlot slot, const CCommand& args)
 {
    auto pPlayer = globals::playerManager.GetPlayerBySlot(slot.Get());

-    if (!pPlayer)
-        return;
+    if (!pPlayer) return;

    if (args.ArgC() > 1 && stricmp(args.Arg(0), "vban") == 0)
    {
        // clients just refuse to send vban for indexes over 32 and all 4 fields are just the same number, so we only get the first one
-        //for (int i = 1; (i < args.ArgC()) && (i < 3); i++) {
-            unsigned int mask = 0;
-            sscanf(args.Arg(1), "%x", &mask);
+        // for (int i = 1; (i < args.ArgC()) && (i < 3); i++) {
+        unsigned int mask = 0;
+        sscanf(args.Arg(1), "%x", &mask);

-            pPlayer->m_selfMutes->SetDWord(0, mask);
+        pPlayer->m_selfMutes->SetDWord(0, mask);
        //}
    }
 }

-} // namespace counterstrikesharp
+} // namespace counterstrikesharp
--- a/src/mm_plugin.cpp
+++ b/src/mm_plugin.cpp
@@ -33,22 +33,18 @@
 #include "entity2/entitysystem.h"
 #include "interfaces/cs2_interfaces.h"

-#define VERSION_STRING "v" BUILD_NUMBER " @ " GITHUB_SHA
+#define VERSION_STRING  "v" BUILD_NUMBER " @ " GITHUB_SHA
 #define BUILD_TIMESTAMP __DATE__ " " __TIME__

 counterstrikesharp::GlobalClass* counterstrikesharp::GlobalClass::head = nullptr;

-CGameEntitySystem *GameEntitySystem()
-{
-    return counterstrikesharp::globals::entitySystem;
-}
+CGameEntitySystem* GameEntitySystem() { return counterstrikesharp::globals::entitySystem; }

 // TODO: Workaround for windows, we __MUST__ have COUNTERSTRIKESHARP_API to handle it.
 // like on windows it should be `extern "C" __declspec(dllexport)`, on linux it should be anything else.
 DLL_EXPORT void InvokeNative(counterstrikesharp::fxNativeContext& context)
 {
-    if (context.nativeIdentifier == 0)
-        return;
+    if (context.nativeIdentifier == 0) return;

    if (context.nativeIdentifier != counterstrikesharp::hash_string_const("QUEUE_TASK_FOR_NEXT_FRAME") &&
        context.nativeIdentifier != counterstrikesharp::hash_string_const("QUEUE_TASK_FOR_NEXT_WORLD_UPDATE") &&
@@ -72,9 +68,9 @@ class GameSessionConfiguration_t
 namespace counterstrikesharp {

 SH_DECL_HOOK3_void(IServerGameDLL, GameFrame, SH_NOATTRIB, 0, bool, bool, bool);
-SH_DECL_HOOK3_void(INetworkServerService, StartupServer, SH_NOATTRIB, 0,
-                   const GameSessionConfiguration_t&, ISource2WorldSession*, const char*);
-SH_DECL_HOOK3_void(IEngineServiceMgr, RegisterLoopMode, SH_NOATTRIB, 0, const char *, ILoopModeFactory *, void **);
+SH_DECL_HOOK3_void(
+    INetworkServerService, StartupServer, SH_NOATTRIB, 0, const GameSessionConfiguration_t&, ISource2WorldSession*, const char*);
+SH_DECL_HOOK3_void(IEngineServiceMgr, RegisterLoopMode, SH_NOATTRIB, 0, const char*, ILoopModeFactory*, void**);
 SH_DECL_HOOK1(IEngineServiceMgr, FindService, SH_NOATTRIB, 0, IEngineService*, const char*);

 CounterStrikeSharpMMPlugin gPlugin;
@@ -85,8 +81,7 @@ ConVar sample_cvar("sample_cvar", "42", 0);
 #endif

 PLUGIN_EXPOSE(CounterStrikeSharpMMPlugin, gPlugin);
-bool CounterStrikeSharpMMPlugin::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen,
-                                      bool late)
+bool CounterStrikeSharpMMPlugin::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool late)
 {
    PLUGIN_SAVEVARS();
    globals::ismm = ismm;
@@ -96,26 +91,22 @@ bool CounterStrikeSharpMMPlugin::Load(PluginId id, ISmmAPI* ismm, char* error, s

    CSSHARP_CORE_INFO("Initializing");

-    GET_V_IFACE_CURRENT(GetEngineFactory, globals::engine, IVEngineServer,
-                        INTERFACEVERSION_VENGINESERVER);
+    GET_V_IFACE_CURRENT(GetEngineFactory, globals::engineServer2, IVEngineServer2, SOURCE2ENGINETOSERVER_INTERFACE_VERSION);
+    GET_V_IFACE_CURRENT(GetEngineFactory, globals::engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);
    GET_V_IFACE_CURRENT(GetEngineFactory, globals::cvars, ICvar, CVAR_INTERFACE_VERSION);
-    GET_V_IFACE_ANY(GetServerFactory, globals::server, IServerGameDLL,
-                    INTERFACEVERSION_SERVERGAMEDLL);
-    GET_V_IFACE_ANY(GetServerFactory, globals::serverGameClients, IServerGameClients,
-                    INTERFACEVERSION_SERVERGAMECLIENTS);
-    GET_V_IFACE_ANY(GetEngineFactory, globals::networkServerService, INetworkServerService,
-                    NETWORKSERVERSERVICE_INTERFACE_VERSION);
+    GET_V_IFACE_ANY(GetServerFactory, globals::server, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL);
+    GET_V_IFACE_ANY(GetServerFactory, globals::serverGameClients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS);
+    GET_V_IFACE_ANY(GetEngineFactory, globals::networkServerService, INetworkServerService, NETWORKSERVERSERVICE_INTERFACE_VERSION);
    GET_V_IFACE_ANY(GetEngineFactory, globals::schemaSystem, CSchemaSystem, SCHEMASYSTEM_INTERFACE_VERSION);
-    GET_V_IFACE_ANY(GetEngineFactory, globals::gameEventSystem, IGameEventSystem,
-                    GAMEEVENTSYSTEM_INTERFACE_VERSION);
-    GET_V_IFACE_ANY(GetEngineFactory, globals::engineServiceManager, IEngineServiceMgr,
-                    ENGINESERVICEMGR_INTERFACE_VERSION);
+    GET_V_IFACE_ANY(GetEngineFactory, globals::gameEventSystem, IGameEventSystem, GAMEEVENTSYSTEM_INTERFACE_VERSION);
+    GET_V_IFACE_ANY(GetEngineFactory, globals::engineServiceManager, IEngineServiceMgr, ENGINESERVICEMGR_INTERFACE_VERSION);

    auto coreconfig_path = std::string(utils::ConfigsDirectory() + "/core");
    globals::coreConfig = new CCoreConfig(coreconfig_path);
    char coreconfig_error[255] = "";

-    if (!globals::coreConfig->Init(coreconfig_error, sizeof(coreconfig_error))) {
+    if (!globals::coreConfig->Init(coreconfig_error, sizeof(coreconfig_error)))
+    {
        CSSHARP_CORE_ERROR("Could not read \'{}\'. Error: {}", coreconfig_path, coreconfig_error);
        return false;
    }
@@ -126,7 +117,8 @@ bool CounterStrikeSharpMMPlugin::Load(PluginId id, ISmmAPI* ismm, char* error, s
    globals::gameConfig = new CGameConfig(gamedata_path);
    char conf_error[255] = "";

-    if (!globals::gameConfig->Init(conf_error, sizeof(conf_error))) {
+    if (!globals::gameConfig->Init(conf_error, sizeof(conf_error)))
+    {
        CSSHARP_CORE_ERROR("Could not read \'{}\'. Error: {}", gamedata_path, conf_error);
        return false;
    }
@@ -140,18 +132,21 @@ bool CounterStrikeSharpMMPlugin::Load(PluginId id, ISmmAPI* ismm, char* error, s

    on_activate_callback = globals::callbackManager.CreateCallback("OnMapStart");

-    SH_ADD_HOOK_MEMFUNC(IServerGameDLL, GameFrame, globals::server, this,
-                        &CounterStrikeSharpMMPlugin::Hook_GameFrame, true);
+    SH_ADD_HOOK_MEMFUNC(IServerGameDLL, GameFrame, globals::server, this, &CounterStrikeSharpMMPlugin::Hook_GameFrame, true);
    SH_ADD_HOOK_MEMFUNC(INetworkServerService, StartupServer, globals::networkServerService, this,
                        &CounterStrikeSharpMMPlugin::Hook_StartupServer, true);
-    SH_ADD_HOOK_MEMFUNC(IEngineServiceMgr, RegisterLoopMode, globals::engineServiceManager, this, &CounterStrikeSharpMMPlugin::Hook_RegisterLoopMode, false);
-    SH_ADD_HOOK_MEMFUNC(IEngineServiceMgr, FindService, globals::engineServiceManager, this, &CounterStrikeSharpMMPlugin::Hook_FindService, true);
+    SH_ADD_HOOK_MEMFUNC(IEngineServiceMgr, RegisterLoopMode, globals::engineServiceManager, this,
+                        &CounterStrikeSharpMMPlugin::Hook_RegisterLoopMode, false);
+    SH_ADD_HOOK_MEMFUNC(IEngineServiceMgr, FindService, globals::engineServiceManager, this, &CounterStrikeSharpMMPlugin::Hook_FindService,
+                        true);

-    if (!globals::dotnetManager.Initialize()) {
+    if (!globals::dotnetManager.Initialize())
+    {
        CSSHARP_CORE_ERROR("Failed to initialize .NET runtime");
    }

-    if (!InitGameSystems()) {
+    if (!InitGameSystems())
+    {
        CSSHARP_CORE_ERROR("Failed to initialize GameSystem!");
        return false;
    }
@@ -166,8 +161,7 @@ bool CounterStrikeSharpMMPlugin::Load(PluginId id, ISmmAPI* ismm, char* error, s
    return true;
 }

-void CounterStrikeSharpMMPlugin::Hook_StartupServer(const GameSessionConfiguration_t& config,
-                                                    ISource2WorldSession*, const char*)
+void CounterStrikeSharpMMPlugin::Hook_StartupServer(const GameSessionConfiguration_t& config, ISource2WorldSession*, const char*)
 {
    globals::entitySystem = interfaces::pGameResourceServiceServer->GetGameEntitySystem();
    globals::entitySystem->AddListenerEntity(&globals::entityManager.entityListener);
@@ -180,10 +174,9 @@ void CounterStrikeSharpMMPlugin::Hook_StartupServer(const GameSessionConfigurati

 bool CounterStrikeSharpMMPlugin::Unload(char* error, size_t maxlen)
 {
-    SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, GameFrame, globals::server, this,
-                           &CounterStrikeSharpMMPlugin::Hook_GameFrame, true);
-    SH_REMOVE_HOOK_MEMFUNC(INetworkServerService, StartupServer, globals::networkServerService,
-                           this, &CounterStrikeSharpMMPlugin::Hook_StartupServer, true);
+    SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, GameFrame, globals::server, this, &CounterStrikeSharpMMPlugin::Hook_GameFrame, true);
+    SH_REMOVE_HOOK_MEMFUNC(INetworkServerService, StartupServer, globals::networkServerService, this,
+                           &CounterStrikeSharpMMPlugin::Hook_StartupServer, true);

    globals::callbackManager.ReleaseCallback(on_activate_callback);

@@ -216,35 +209,39 @@ void CounterStrikeSharpMMPlugin::Hook_GameFrame(bool simulating, bool bFirstTick

    auto size = m_nextTasks.try_dequeue_bulk(out_list.begin(), 1024);

-    if (size > 0) {
-        CSSHARP_CORE_TRACE("Executing queued tasks of size: {0} on tick number {1}", size,
-                           globals::getGlobalVars()->tickcount);
+    if (size > 0)
+    {
+        CSSHARP_CORE_TRACE("Executing queued tasks of size: {0} on tick number {1}", size, globals::getGlobalVars()->tickcount);

-        for (size_t i = 0; i < size; i++) {
+        for (size_t i = 0; i < size; i++)
+        {
            out_list[i]();
        }
    }

    auto callbacks = globals::tickScheduler.getCallbacks(globals::getGlobalVars()->tickcount);
-    if (callbacks.size() > 0) {
+    if (callbacks.size() > 0)
+    {
        CSSHARP_CORE_TRACE("Executing frame specific tasks of size: {0} on tick number {1}", callbacks.size(),
                           globals::getGlobalVars()->tickcount);

-        for (auto& callback : callbacks) {
+        for (auto& callback : callbacks)
+        {
            callback();
        }
    }
 }

 // Potentially might not work
-void CounterStrikeSharpMMPlugin::OnLevelInit(char const* pMapName, char const* pMapEntities,
-                                             char const* pOldLevel, char const* pLandmarkName,
-                                             bool loadGame, bool background)
+void CounterStrikeSharpMMPlugin::OnLevelInit(
+    char const* pMapName, char const* pMapEntities, char const* pOldLevel, char const* pLandmarkName, bool loadGame, bool background)
 {
    CSSHARP_CORE_TRACE("name={0},mapname={1}", "LevelInit", pMapName);
 }

-void CounterStrikeSharpMMPlugin::Hook_RegisterLoopMode(const char *pszLoopModeName, ILoopModeFactory *pLoopModeFactory, void **ppGlobalPointer)
+void CounterStrikeSharpMMPlugin::Hook_RegisterLoopMode(const char* pszLoopModeName,
+                                                       ILoopModeFactory* pLoopModeFactory,
+                                                       void** ppGlobalPointer)
 {
    if (strcmp(pszLoopModeName, "game") == 0)
    {
@@ -256,7 +253,7 @@ void CounterStrikeSharpMMPlugin::Hook_RegisterLoopMode(const char *pszLoopModeNa

 IEngineService* CounterStrikeSharpMMPlugin::Hook_FindService(const char* serviceName)
 {
-    IEngineService *pService = META_RESULT_ORIG_RET(IEngineService *);
+    IEngineService* pService = META_RESULT_ORIG_RET(IEngineService*);

    return pService;
 }
@@ -277,15 +274,9 @@ const char* CounterStrikeSharpMMPlugin::GetLogTag() { return "CSSHARP"; }

 const char* CounterStrikeSharpMMPlugin::GetAuthor() { return "Roflmuffin"; }

-const char* CounterStrikeSharpMMPlugin::GetDescription()
-{
-    return "Counter Strike .NET Scripting Runtime";
-}
+const char* CounterStrikeSharpMMPlugin::GetDescription() { return "Counter Strike .NET Scripting Runtime"; }

 const char* CounterStrikeSharpMMPlugin::GetName() { return "CounterStrikeSharp"; }

-const char* CounterStrikeSharpMMPlugin::GetURL()
-{
-    return "https://github.com/roflmuffin/CounterStrikeSharp";
-}
+const char* CounterStrikeSharpMMPlugin::GetURL() { return "https://github.com/roflmuffin/CounterStrikeSharp"; }
 } // namespace counterstrikesharp
--- a/src/scripting/natives/natives_entities.cpp
+++ b/src/scripting/natives/natives_entities.cpp
@@ -14,21 +14,22 @@
 *  along with CounterStrikeSharp.  If not, see <https://www.gnu.org/licenses/>. *
 */

+#include <public/entity2/entitysystem.h>
+
 #include <ios>
 #include <sstream>

+#include "core/log.h"
+#include "core/managers/entity_manager.h"
+#include "core/managers/player_manager.h"
+#include "core/memory.h"
 #include "scripting/autonative.h"
 #include "scripting/script_engine.h"
-#include "core/memory.h"
-#include "core/log.h"
-#include "core/managers/player_manager.h"
-#include "core/managers/entity_manager.h"
-
-#include <public/entity2/entitysystem.h>

 namespace counterstrikesharp {

-CBaseEntity* GetEntityFromIndex(ScriptContext& script_context) {
+CEntityInstance* GetEntityFromIndex(ScriptContext& script_context)
+{
    if (!globals::entitySystem)
    {
        script_context.ThrowNativeError("Entity system is not yet initialized");
@@ -37,55 +38,64 @@ CBaseEntity* GetEntityFromIndex(ScriptContext& script_context) {

    auto entityIndex = script_context.GetArgument<int>(0);

-    return globals::entitySystem->GetBaseEntity(CEntityIndex(entityIndex));
+    return globals::entitySystem->GetEntityInstance(CEntityIndex(entityIndex));
 }

-int GetUserIdFromIndex(ScriptContext& scriptContext) {
+int GetUserIdFromIndex(ScriptContext& scriptContext)
+{
    auto entityIndex = scriptContext.GetArgument<int>(0);

    // CPlayerSlot is 1 less than index
    return globals::engine->GetPlayerUserId(CPlayerSlot(entityIndex - 1)).Get();
 }

-const char* GetDesignerName(ScriptContext& scriptContext) {
-    auto entity = scriptContext.GetArgument<CBaseEntity*>(0);
+const char* GetDesignerName(ScriptContext& scriptContext)
+{
+    auto entity = scriptContext.GetArgument<CEntityInstance*>(0);
    return entity->GetClassname();
 }

-void* GetEntityPointerFromHandle(ScriptContext& scriptContext) {
-    if (!globals::entitySystem) {
+void* GetEntityPointerFromHandle(ScriptContext& scriptContext)
+{
+    if (!globals::entitySystem)
+    {
        scriptContext.ThrowNativeError("Entity system is not yet initialized");
        return nullptr;
    }

    auto handle = scriptContext.GetArgument<CEntityHandle*>(0);

-    if (!handle->IsValid()) {
+    if (!handle->IsValid())
+    {
        return nullptr;
    }

-    return globals::entitySystem->GetBaseEntity(*handle);
+    return globals::entitySystem->GetEntityInstance(*handle);
 }

-void* GetEntityPointerFromRef(ScriptContext& scriptContext) {
-    if (!globals::entitySystem) {
+void* GetEntityPointerFromRef(ScriptContext& scriptContext)
+{
+    if (!globals::entitySystem)
+    {
        scriptContext.ThrowNativeError("Entity system yet is not initialized");
        return nullptr;
    }

    auto ref = scriptContext.GetArgument<unsigned int>(0);

-    if (ref == INVALID_EHANDLE_INDEX) {
+    if (ref == INVALID_EHANDLE_INDEX)
+    {
        return nullptr;
    }

    CBaseHandle hndl(ref);

-    return globals::entitySystem->GetBaseEntity(hndl);
+    return globals::entitySystem->GetEntityInstance(hndl);
 }

-unsigned int GetRefFromEntityPointer(ScriptContext& scriptContext) {
-    auto* pEntity = scriptContext.GetArgument<CBaseEntity*>(0);
+unsigned int GetRefFromEntityPointer(ScriptContext& scriptContext)
+{
+    auto* pEntity = scriptContext.GetArgument<CEntityInstance*>(0);

    if (pEntity == nullptr)
    {
@@ -102,36 +112,43 @@ unsigned int GetRefFromEntityPointer(ScriptContext& scriptContext) {
    return hndl.ToInt();
 }

-bool IsRefValidEntity(ScriptContext& scriptContext) {
-    if (!globals::entitySystem) {
+bool IsRefValidEntity(ScriptContext& scriptContext)
+{
+    if (!globals::entitySystem)
+    {
        scriptContext.ThrowNativeError("Entity system yet is not initialized");
        return false;
    }

    auto ref = scriptContext.GetArgument<unsigned int>(0);

-    if (ref == INVALID_EHANDLE_INDEX) {
+    if (ref == INVALID_EHANDLE_INDEX)
+    {
        return false;
    }

    CBaseHandle hndl(ref);

-    if (!hndl.IsValid()) {
+    if (!hndl.IsValid())
+    {
        return false;
    }

-    return globals::entitySystem->GetBaseEntity(hndl) != nullptr;
+    return globals::entitySystem->GetEntityInstance(hndl) != nullptr;
 }

-void PrintToConsole(ScriptContext& scriptContext) {
+void PrintToConsole(ScriptContext& scriptContext)
+{
    auto index = scriptContext.GetArgument<int>(0);
    auto message = scriptContext.GetArgument<const char*>(1);

-    globals::engine->ClientPrintf(CPlayerSlot{index - 1}, message);
+    globals::engine->ClientPrintf(CPlayerSlot{ index - 1 }, message);
 }

-CEntityIdentity* GetFirstActiveEntity(ScriptContext& script_context) {
-    if (!globals::entitySystem) {
+CEntityIdentity* GetFirstActiveEntity(ScriptContext& script_context)
+{
+    if (!globals::entitySystem)
+    {
        script_context.ThrowNativeError("Entity system yet is not initialized");
        return nullptr;
    }
@@ -139,8 +156,10 @@ CEntityIdentity* GetFirstActiveEntity(ScriptContext& script_context) {
    return globals::entitySystem->m_EntityList.m_pFirstActiveEntity;
 }

-void* GetConcreteEntityListPointer(ScriptContext& script_context) {
-    if (!globals::entitySystem) {
+void* GetConcreteEntityListPointer(ScriptContext& script_context)
+{
+    if (!globals::entitySystem)
+    {
        script_context.ThrowNativeError("Entity system yet is not initialized");
        return nullptr;
    }
@@ -148,27 +167,32 @@ void* GetConcreteEntityListPointer(ScriptContext& script_context) {
    return &globals::entitySystem->m_EntityList;
 }

-unsigned long GetPlayerAuthorizedSteamID(ScriptContext& script_context) {
+unsigned long GetPlayerAuthorizedSteamID(ScriptContext& script_context)
+{
    auto iSlot = script_context.GetArgument<int>(0);

    auto pPlayer = globals::playerManager.GetPlayerBySlot(iSlot);
-    if (pPlayer == nullptr || !pPlayer->m_is_authorized) {
+    if (pPlayer == nullptr || !pPlayer->m_is_authorized)
+    {
        return -1;
    }

    auto pSteamId = pPlayer->GetSteamId();
-    if (pSteamId == nullptr) {
+    if (pSteamId == nullptr)
+    {
        return -1;
    }

    return pSteamId->ConvertToUint64();
 }

-const char* GetPlayerIpAddress(ScriptContext& script_context) {
+const char* GetPlayerIpAddress(ScriptContext& script_context)
+{
    auto iSlot = script_context.GetArgument<int>(0);

    auto pPlayer = globals::playerManager.GetPlayerBySlot(iSlot);
-    if (pPlayer == nullptr) {
+    if (pPlayer == nullptr)
+    {
        return nullptr;
    }

@@ -236,8 +260,7 @@ REGISTER_NATIVES(entities, {
    ScriptEngine::RegisterNativeHandler("GET_ENTITY_FROM_INDEX", GetEntityFromIndex);
    ScriptEngine::RegisterNativeHandler("GET_USERID_FROM_INDEX", GetUserIdFromIndex);
    ScriptEngine::RegisterNativeHandler("GET_DESIGNER_NAME", GetDesignerName);
-    ScriptEngine::RegisterNativeHandler("GET_ENTITY_POINTER_FROM_HANDLE",
-                                        GetEntityPointerFromHandle);
+    ScriptEngine::RegisterNativeHandler("GET_ENTITY_POINTER_FROM_HANDLE", GetEntityPointerFromHandle);
    ScriptEngine::RegisterNativeHandler("GET_ENTITY_POINTER_FROM_REF", GetEntityPointerFromRef);
    ScriptEngine::RegisterNativeHandler("GET_REF_FROM_ENTITY_POINTER", GetRefFromEntityPointer);
    ScriptEngine::RegisterNativeHandler("GET_CONCRETE_ENTITY_LIST_POINTER", GetConcreteEntityListPointer);
@@ -251,4 +274,4 @@ REGISTER_NATIVES(entities, {
    ScriptEngine::RegisterNativeHandler("ACCEPT_INPUT", AcceptInput);
    ScriptEngine::RegisterNativeHandler("ADD_ENTITY_IO_EVENT", AddEntityIOEvent);
 })
-}  // namespace counterstrikesharp
+} // namespace counterstrikesharp
--- a/src/scripting/natives/natives_voice.cpp
+++ b/src/scripting/natives/natives_voice.cpp
@@ -14,38 +14,40 @@
 *  along with CounterStrikeSharp.  If not, see <https://www.gnu.org/licenses/>. *
 */

-#include "scripting/autonative.h"
-#include "scripting/script_engine.h"
-#include "core/managers/player_manager.h"
 #include <public/entity2/entitysystem.h>

+#include "core/managers/player_manager.h"
+#include "scripting/autonative.h"
+#include "scripting/script_engine.h"

 namespace counterstrikesharp {

 void SetClientListening(ScriptContext& scriptContext)
 {
-    auto receiver = scriptContext.GetArgument<CBaseEntity*>(0);
-    auto sender = scriptContext.GetArgument<CBaseEntity*>(1);
+    auto receiver = scriptContext.GetArgument<CEntityInstance*>(0);
+    auto sender = scriptContext.GetArgument<CEntityInstance*>(1);
    auto listen = scriptContext.GetArgument<ListenOverride>(2);

-    if (!receiver) {
+    if (!receiver)
+    {
        scriptContext.ThrowNativeError("Receiver is a null pointer");
        return;
    }

-    if (!sender) {
+    if (!sender)
+    {
        scriptContext.ThrowNativeError("Sender is a null pointer");
        return;
    }

    auto iSenderSlot = sender->GetEntityIndex().Get() - 1;

-    if (iSenderSlot < 0 || iSenderSlot >= globals::getGlobalVars()->maxClients)
-        scriptContext.ThrowNativeError("Invalid sender");
+    if (iSenderSlot < 0 || iSenderSlot >= globals::getGlobalVars()->maxClients) scriptContext.ThrowNativeError("Invalid sender");

    auto pPlayer = globals::playerManager.GetPlayerBySlot(receiver->GetEntityIndex().Get() - 1);

-    if (pPlayer == nullptr) {
+    if (pPlayer == nullptr)
+    {
        scriptContext.ThrowNativeError("Invalid receiver");
        return;
    }
@@ -55,27 +57,29 @@ void SetClientListening(ScriptContext& scriptContext)

 ListenOverride GetClientListening(ScriptContext& scriptContext)
 {
-    auto receiver = scriptContext.GetArgument<CBaseEntity*>(0);
-    auto sender = scriptContext.GetArgument<CBaseEntity*>(1);
+    auto receiver = scriptContext.GetArgument<CEntityInstance*>(0);
+    auto sender = scriptContext.GetArgument<CEntityInstance*>(1);

-    if (!receiver) {
+    if (!receiver)
+    {
        scriptContext.ThrowNativeError("Receiver is a null pointer");
        return Listen_Default;
    }

-    if (!sender) {
+    if (!sender)
+    {
        scriptContext.ThrowNativeError("Sender is a null pointer");
        return Listen_Default;
    }

    auto iSenderSlot = sender->GetEntityIndex().Get() - 1;

-    if (iSenderSlot < 0 || iSenderSlot >= globals::getGlobalVars()->maxClients)
-        scriptContext.ThrowNativeError("Invalid sender");
+    if (iSenderSlot < 0 || iSenderSlot >= globals::getGlobalVars()->maxClients) scriptContext.ThrowNativeError("Invalid sender");

    auto pPlayer = globals::playerManager.GetPlayerBySlot(receiver->GetEntityIndex().Get() - 1);

-    if (pPlayer == nullptr) {
+    if (pPlayer == nullptr)
+    {
        scriptContext.ThrowNativeError("Invalid receiver");
        return Listen_Default;
    }
@@ -85,16 +89,18 @@ ListenOverride GetClientListening(ScriptContext& scriptContext)

 void SetClientVoiceFlags(ScriptContext& scriptContext)
 {
-    auto client = scriptContext.GetArgument<CBaseEntity*>(0);
+    auto client = scriptContext.GetArgument<CEntityInstance*>(0);
    auto flags = scriptContext.GetArgument<VoiceFlag_t>(1);

-    if (!client) {
+    if (!client)
+    {
        scriptContext.ThrowNativeError("Receiver is a null pointer");
        return;
    }
    auto pPlayer = globals::playerManager.GetPlayerBySlot(client->GetEntityIndex().Get() - 1);

-    if (pPlayer == nullptr) {
+    if (pPlayer == nullptr)
+    {
        scriptContext.ThrowNativeError("Invalid receiver");
        return;
    }
@@ -104,16 +110,18 @@ void SetClientVoiceFlags(ScriptContext& scriptContext)

 VoiceFlag_t GetClientVoiceFlags(ScriptContext& scriptContext)
 {
-    auto client = scriptContext.GetArgument<CBaseEntity*>(0);
+    auto client = scriptContext.GetArgument<CEntityInstance*>(0);

-    if (!client) {
+    if (!client)
+    {
        scriptContext.ThrowNativeError("Receiver is a null pointer");
        return VoiceFlag_t{};
    }

    auto pPlayer = globals::playerManager.GetPlayerBySlot(client->GetEntityIndex().Get() - 1);

-    if (pPlayer == nullptr) {
+    if (pPlayer == nullptr)
+    {
        scriptContext.ThrowNativeError("Invalid receiver");
    }

@@ -126,4 +134,4 @@ REGISTER_NATIVES(voice, {
    ScriptEngine::RegisterNativeHandler("SET_CLIENT_VOICE_FLAGS", SetClientVoiceFlags);
    ScriptEngine::RegisterNativeHandler("GET_CLIENT_VOICE_FLAGS", GetClientVoiceFlags);
 })
-} // namespace counterstrikesharp
+} // namespace counterstrikesharp
Author	SHA1	Message	Date
Michael Wilson	cafc4e237f	Initial update after 2024-05-23 CS2 update (#461 )	2024-05-25 18:50:09 +10:00
dependabot[bot]	02d5191e74	chore(deps): bump libraries/hl2sdk-cs2 from `f7ed6a0` to `36dd2db` (#452 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: roflmuffin <shortguy014@gmail.com>	2024-05-10 11:50:41 +10:00
dependabot[bot]	aec696abc0	chore(deps): bump libraries/hl2sdk-cs2 from `9ddef9a` to `f7ed6a0` (#451 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-09 00:43:54 +10:00
Roflmuffin	c01aeec14b	[no ci] chore: fix dependabot prefix	2024-05-08 20:13:19 +10:00
dependabot[bot]	41e7bee85a	chore(deps): update hl2sdk: bump libraries/metamod-source from `e857fbe` to `607301a` (#450 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-08 20:10:01 +10:00
Roflmuffin	9834271956	[no ci] chore: add metamod source dependabot config	2024-05-08 19:59:53 +10:00