see if we can cache the player HSCRIPT

Author: rtldg

addons/sourcemod/scripting/shavit-checkpoints.sp

@@ -127,6 +127,8 @@ enum VScript_Checkpoint_State
 }
 VScript_Checkpoint_State gI_VScript_Checkpointing[MAXPLAYERS+1];
 StringMap gH_VScript_Checkpoint_CustomData[MAXPLAYERS+1];
+// Caching this makes me happy
+HSCRIPT gH_PlayerHSCRIPT[MAXPLAYERS+1];
 
 
 public Plugin myinfo =
@@ -513,6 +515,11 @@ public void OnClientPutInServer(int client)
 {
 	gF_NextSuicide[client] = GetGameTime();
 
+	if (gB_VScript)
+	{
+		gH_PlayerHSCRIPT[client] = VScript_EntityToHScript(client);
+	}
+
 	if (IsFakeClient(client))
 	{
 		return;
@@ -1793,7 +1800,7 @@ void SaveCheckpointCache(int saver, int target, cp_cache_t cpcache, int index, H
 		{
 			// ::Timer_OnCheckpointSave <- function(player)
 			VScriptExecute Timer_OnCheckpointSave = new VScriptExecute(HSCRIPT_RootTable.GetValue("Timer_OnCheckpointSave"));
-			Timer_OnCheckpointSave.SetParam(1, FIELD_HSCRIPT, VScript_EntityToHScript(target));
+			Timer_OnCheckpointSave.SetParam(1, FIELD_HSCRIPT, gH_PlayerHSCRIPT[target]);
 			Timer_OnCheckpointSave.Execute();
 			delete Timer_OnCheckpointSave;
 		}
@@ -1907,7 +1914,7 @@ bool LoadCheckpointCache(int client, cp_cache_t cpcache, int index, bool force =
 		{
 			// ::Timer_OnCheckpointLoadPre <- function(player)
 			VScriptExecute Timer_OnCheckpointLoadPre = new VScriptExecute(HSCRIPT_RootTable.GetValue("Timer_OnCheckpointLoadPre"));
-			Timer_OnCheckpointLoadPre.SetParam(1, FIELD_HSCRIPT, VScript_EntityToHScript(client));
+			Timer_OnCheckpointLoadPre.SetParam(1, FIELD_HSCRIPT, gH_PlayerHSCRIPT[client]);
 			Timer_OnCheckpointLoadPre.Execute();
 			delete Timer_OnCheckpointLoadPre;
 		}
@@ -2403,7 +2410,7 @@ void Do_Timer_OnCheckpointLoadPost(int client, StringMap customdata)
 		{
 			// ::Timer_OnCheckpointLoadPost <- function(player)
 			VScriptExecute Timer_OnCheckpointLoadPost = new VScriptExecute(HSCRIPT_RootTable.GetValue("Timer_OnCheckpointLoadPost"));
-			Timer_OnCheckpointLoadPost.SetParam(1, FIELD_HSCRIPT, VScript_EntityToHScript(client));
+			Timer_OnCheckpointLoadPost.SetParam(1, FIELD_HSCRIPT, gH_PlayerHSCRIPT[client]);
 			Timer_OnCheckpointLoadPost.Execute();
 			delete Timer_OnCheckpointLoadPost;
 		}

addons/sourcemod/scripting/shavit-core.sp

@@ -65,7 +65,8 @@ Address gI_TF2PreventBunnyJumpingAddr = Address_Null;
 VScriptFunction gH_VScript_Timer_GetTime;
 VScriptFunction gH_VScript_Timer_GetStatus;
 VScriptFunction gH_VScript_Timer_GetTrack;
-
+// Caching this makes me happy
+HSCRIPT gH_PlayerHSCRIPT[MAXPLAYERS+1];
 
 // database handle
 Database gH_SQL = null;
@@ -2069,7 +2070,7 @@ public int Native_FinishMap(Handle handler, int numParams)
 		{
 			// ::Timer_OnFinish <- function(player)
 			VScriptExecute Timer_OnFinish = new VScriptExecute(HSCRIPT_RootTable.GetValue("Timer_OnFinish"));
-			Timer_OnFinish.SetParam(1, FIELD_HSCRIPT, VScript_EntityToHScript(client));
+			Timer_OnFinish.SetParam(1, FIELD_HSCRIPT, gH_PlayerHSCRIPT[client]);
 			Timer_OnFinish.SetParam(2, FIELD_INTEGER, snapshot.iTimerTrack);
 			Timer_OnFinish.Execute();
 			delete Timer_OnFinish;
@@ -2685,8 +2686,9 @@ void StartTimer(int client, int track, bool skipGroundCheck)
 			{
 				if (HSCRIPT_RootTable.ValueExists("Timer_OnStart"))
 				{
+					// ::Timer_OnStart <- function(player, track)
 					VScriptExecute Timer_OnStart = new VScriptExecute(HSCRIPT_RootTable.GetValue("Timer_OnStart"));
-					Timer_OnStart.SetParam(1, FIELD_HSCRIPT, VScript_EntityToHScript(client));
+					Timer_OnStart.SetParam(1, FIELD_HSCRIPT, gH_PlayerHSCRIPT[client]);
 					Timer_OnStart.SetParam(2, FIELD_INTEGER, track);
 					Timer_OnStart.Execute();
 					delete Timer_OnStart;
@@ -2804,7 +2806,12 @@ public void OnClientPutInServer(int client)
 	StopTimer(client);
 	Bhopstats_OnClientPutInServer(client);
 
-	if(!IsClientConnected(client) || IsFakeClient(client))
+	if (gB_VScript)
+	{
+		gH_PlayerHSCRIPT[client] = VScript_EntityToHScript(client);
+	}
+
+	if (IsFakeClient(client))
 	{
 		return;
 	}