Fix HammerID patch

Author: Vauff

gamedata/cs2fixes.jsonc

@@ -373,6 +373,13 @@
 			"library": "server",
 			"windows": "48 89 5C 24 ? 57 48 83 EC ? 48 8B 02 48 8B F9 48 8B CA 48 8B DA FF 90 ? ? ? ? 84 C0 74 ? F3 0F 10 8F",
 			"linux": "48 8B 06 55 48 89 E5 41 54 49 89 FC 48 89 F7 53 48 89 F3 FF 90"
+		},
+		// Function that only has "hammerUniqueId" string, signature points to the outer if statement that determines if hammerid gets written to schema
+		"SetSchemaHammerUniqueId":
+		{
+			"library": "server",
+			"windows": "75 ? 48 8B 03 48 8B CB FF 90 ? ? ? ? 84 C0 74 ? 48 8D 05",
+			"linux": "75 ? 48 8B 03 48 8D 15 ? ? ? ? 48 8B 80 ? ? ? ? 48 39 D0 75 ? 48 83 C4"
 		}
 	},
 	"Offsets":
@@ -393,11 +400,6 @@
 			"windows": 103,
 			"linux": 102
 		},
-		"GetHammerUniqueId":
-		{
-			"windows": 112,
-			"linux": 111
-		},
 		"CBaseEntity::Use":
 		{
 			"windows": 145,
@@ -548,6 +550,12 @@
 		{
 			"windows": "49 89 F8 90",
 			"linux": "48 89 DA 90 90"
+		},
+		// jnz -> jmp
+		"SetSchemaHammerUniqueId":
+		{
+			"windows": "EB",
+			"linux": "EB"
 		}
 	}
 }

src/entitylistener.cpp

@@ -31,16 +31,6 @@ CEntityListener* g_pEntityListener = nullptr;
 
 CConVar<bool> g_cvarGrenadeNoBlock("cs2f_noblock_grenades", FCVAR_NONE, "Whether to use noblock on grenade projectiles", false);
 
-void Patch_GetHammerUniqueId(CEntityInstance* pEntity)
-{
-	static int offset = g_GameConfig->GetOffset("GetHammerUniqueId");
-	void** vtable = *(void***)pEntity;
-
-	// xor al, al -> mov al, 1
-	// so it always returns true and allows hammerid to be copied into the schema prop
-	Plat_WriteMemory(vtable[offset], (uint8_t*)"\xB0\x01", 2);
-}
-
 void CEntityListener::OnEntitySpawned(CEntityInstance* pEntity)
 {
 #ifdef _DEBUG
@@ -59,8 +49,6 @@ void CEntityListener::OnEntitySpawned(CEntityInstance* pEntity)
 
 void CEntityListener::OnEntityCreated(CEntityInstance* pEntity)
 {
-	ExecuteOnce(Patch_GetHammerUniqueId(pEntity));
-
 	if (!V_strcmp("cs_gamerules", pEntity->GetClassname()))
 		g_pGameRules = ((CCSGameRulesProxy*)pEntity)->m_pGameRules;
 }

src/patches.cpp

@@ -34,6 +34,7 @@ CMemPatch g_CommonPatches[] =
 		CMemPatch("BotNavIgnore", "BotNavIgnore"),
 		CMemPatch("CheckJumpButtonWater", "FixWaterFloorJump"),
 		CMemPatch("CPhysBox_Use", "CPhysBox_Use"),
+		CMemPatch("SetSchemaHammerUniqueId", "SetSchemaHammerUniqueId"),
 };
 
 CConVar<bool> cs2f_movement_unlocker_enable("cs2f_movement_unlocker_enable", FCVAR_NONE, "Whether to enable movement unlocker", false,