Skip to content

Additional GameData changes #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Additional GameData changes #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
20b44af
fix: Some of the offsets and GetCSWeaponDataFromKey
K4ryuu Jul 29, 2025
933c92d
fix: Changed some offsets in both win and lin
K4ryuu Jul 29, 2025
7936828
Update gamedata.json
K4ryuu Jul 29, 2025
3633b58
fix: IGameSystem_InitAllSystems_pFirst xref
K4ryuu Jul 29, 2025
04f5eed
fix: ClientPrint (linux) after last update
K4ryuu Jul 30, 2025
9c7fd34
fix(gamedata): adjusted `CCSGameRules_FindPickerEntity` offsets
KillStr3aK Jul 30, 2025
5d01de4
tweak(CCSGameRules): adjusted `FindPickerEntity` virtual func call
KillStr3aK Jul 30, 2025
cacbb36
Merge pull request #1 from KillStr3aK/k4p
K4ryuu Jul 30, 2025
c942e5e
fix: CEntityInstance_AcceptInput (windows)
K4ryuu Jul 30, 2025
4cc64de
Update gamedata.json
K4ryuu Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions configs/addons/counterstrikesharp/gamedata/gamedata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"signatures": {
"library": "server",
"windows": "48 85 C9 0F 84 ? ? ? ? 48 89 5C 24 ? 55",
"linux": "55 48 8D 05 F8 5F 8B 00"
"linux": "55 48 8D 05 ? ? ? ? 48 89 E5 41 57 41 89 F7 31 F6"
}
},
"CCSPlayerController_SwitchTeam": {
Expand All @@ -22,14 +22,14 @@
},
"CCSPlayerController_ChangeTeam": {
"offsets": {
"windows": 100,
"linux": 99
"windows": 107,
"linux": 106
}
},
"CCSPlayerController_Respawn": {
"offsets": {
"windows": 257,
"linux": 259
"windows": 276,
"linux": 278
}
},
"CBasePlayerController_SetPawn": {
Expand Down Expand Up @@ -99,7 +99,7 @@
"signatures": {
"library": "server",
"windows": "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 57 48 83 EC ? 33 ED 48 8B FA 8B F1",
"linux": "55 48 89 E5 41 54 53 48 81 EC 10 01 00 00 48 85 FF"
"linux": "55 48 89 E5 41 54 53 48 81 EC ? ? ? ? 48 85 FF"
}
},
"CCSPlayer_ItemServices_GiveNamedItem": {
Expand Down Expand Up @@ -135,8 +135,8 @@
},
"CCSGameRules_FindPickerEntity": {
"offsets": {
"windows": 27,
"linux": 28
"windows": 25,
"linux": 26
}
},
"UTIL_CreateEntityByName": {
Expand All @@ -163,7 +163,7 @@
"CEntityInstance_AcceptInput": {
"signatures": {
"library": "server",
"windows": "E8 ? ? ? ? F6 44 24 ? ? 74 ? 48 8B 05 ? ? ? ? 48 8B 54 24 ? 48 8B 08 48 8B 01 FF 50 ? 48 83 C4 ? 5B C3 CC CC CC 48 89 5C 24",
"windows": "89 5C 24 ? 48 89 74 24 ? 57 48 83 EC ? 49 8B F0 48 8B D9 48 8B 0D",
"linux": "55 48 89 F0 48 89 E5 41 57 49 89 FF 41 56 48 8D 7D C0"
}
},
Expand All @@ -183,8 +183,8 @@
},
"CBasePlayerPawn_CommitSuicide": {
"offsets": {
"windows": 380,
"linux": 380
"windows": 404,
"linux": 404
}
},
"CBasePlayerPawn_RemovePlayerItem": {
Expand All @@ -196,8 +196,8 @@
},
"CBaseEntity_Teleport": {
"offsets": {
"windows": 157,
"linux": 156
"windows": 166,
"linux": 165
}
},
"CBaseEntity_TakeDamageOld": {
Expand Down Expand Up @@ -243,8 +243,8 @@
"IGameSystem_InitAllSystems_pFirst": {
"signatures": {
"library": "server",
"windows": "48 89 5C 24 ? 55 56 57 48 83 EC ? 48 8D 05",
"linux": "4C 8B 35 ? ? ? ? 4D 85 F6 75 ? E9"
"windows": "48 8B 1D ? ? ? ? 48 85 DB 0F 84 ? ? ? ? BD",
"linux": "4C 8B 35 ? ? ? ? 4D 85 F6 75"
}
},
"CEntityResourceManifest_AddResource": {
Expand All @@ -262,8 +262,8 @@
},
"CheckTransmitPlayerSlot": {
"offsets": {
"windows": 584,
"linux": 584
"windows": 576,
"linux": 576
}
}
}
21 changes: 19 additions & 2 deletions managed/CounterStrikeSharp.API/Core/Model/CCSGameRules.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* along with CounterStrikeSharp. If not, see <https://www.gnu.org/licenses/>. *
*/

using System.Runtime.InteropServices;

using CounterStrikeSharp.API.Modules.Entities.Constants;
using CounterStrikeSharp.API.Modules.Memory;
using CounterStrikeSharp.API.Modules.Utils;
Expand All @@ -30,11 +32,26 @@ public void TerminateRound(float delay, RoundEndReason roundEndReason)
VirtualFunctions.TerminateRound(Handle, roundEndReason, delay, 0, 0);
}

internal CBaseEntity? FindPickerEntityInternal(CBasePlayerController player)
{
// TODO: TEST!
// the third parameter seems to be something like `CDefaultTypedEntityInstanceFilter<CBaseEntity>` but its optional (earlier it was a string?)

if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
VirtualFunctionWithReturn<CCSGameRules, CBasePlayerController, IntPtr?, CBaseEntity?> CCSGameRules_FindPickerEntity = new(Handle, GameData.GetOffset("CCSGameRules_FindPickerEntity"));
return CCSGameRules_FindPickerEntity.Invoke(this, player, null);
} else
{
VirtualFunctionWithReturn<CCSGameRules, CBasePlayerController, IntPtr?, double, double, CBaseEntity?> CCSGameRules_FindPickerEntity = new(Handle, GameData.GetOffset("CCSGameRules_FindPickerEntity"));
return CCSGameRules_FindPickerEntity.Invoke(this, player, null, 0, 0); // on linux we have a fourth and fifth parameter aswell, but they are unused because the condition for them is always unmet.
}
}

public T? FindPickerEntity<T>(CBasePlayerController player)
where T : CBaseEntity
{
VirtualFunctionWithReturn<CCSGameRules, CBasePlayerController, CBaseEntity?> CCSGameRules_FindPickerEntity = new (Handle, GameData.GetOffset("CCSGameRules_FindPickerEntity"));
CBaseEntity? entity = CCSGameRules_FindPickerEntity.Invoke(this, player);
CBaseEntity? entity = FindPickerEntityInternal(player);

if (entity == null || !entity.IsValid)
{
Expand Down
Loading