Merge pull request #631 from shavitush/very_good_yes

v2.1.1 hotfix
shavitush · May 3, 2018 · fda9d81 · fda9d81
2 parents 7d91b62 + ff31efe
commit fda9d81
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/addons/sourcemod/scripting/include/shavit.inc b/addons/sourcemod/scripting/include/shavit.inc
@@ -23,7 +23,7 @@
 #endif
 #define _shavit_included
 
-#define SHAVIT_VERSION "2.1.0"
+#define SHAVIT_VERSION "2.1.1"
 #define STYLE_LIMIT 256
 #define MAX_ZONES 64
 

diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
@@ -1673,9 +1673,6 @@ void SQL_DBConnect()
 	// support unicode names
 	gH_SQL.SetCharset("utf8");
 
-	Call_StartForward(gH_Forwards_OnDatabaseLoaded);
-	Call_Finish();
-
 	char[] sDriver = new char[8];
 	gH_SQL.Driver.GetIdentifier(sDriver, 8);
 	gB_MySQL = StrEqual(sDriver, "mysql", false);
@@ -1727,6 +1724,9 @@ public void SQL_CreateTable_Callback(Database db, DBResultSet results, const cha
 		FormatEx(sQuery, 192, "SELECT map FROM %s%s WHERE map LIKE 'workshop%%' GROUP BY map;", gS_MySQLPrefix, sTables[i]);
 		gH_SQL.Query(SQL_TableMigration3_Callback, sQuery, dp, DBPrio_Low);
 	}
+
+	Call_StartForward(gH_Forwards_OnDatabaseLoaded);
+	Call_Finish();
 }
 
 public void SQL_TableMigration1_Callback(Database db, DBResultSet results, const char[] error, any data)

diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp
@@ -1801,7 +1801,16 @@ bool SaveCheckpoint(int client, int index, bool overflow = false)
 	cpcache[fCPGravity] = GetEntityGravity(target);
 	cpcache[fCPSpeed] = GetEntPropFloat(target, Prop_Send, "m_flLaggedMovementValue");
 	cpcache[fCPStamina] = (gEV_Type != Engine_TF2)? GetEntPropFloat(target, Prop_Send, "m_flStamina"):0.0;
-	cpcache[iCPFlags] = GetEntityFlags(target);
+
+	int iFlags = GetEntityFlags(target);
+
+	if(IsFakeClient(target))
+	{
+		iFlags |= FL_CLIENT;
+		iFlags |= FL_AIMTARGET;
+	}
+
+	cpcache[iCPFlags] = iFlags;
 
 	if(gEV_Type != Engine_TF2)
 	{

diff --git a/addons/sourcemod/scripting/shavit-wr.sp b/addons/sourcemod/scripting/shavit-wr.sp
@@ -1724,15 +1724,15 @@ public void SQL_SubMenu_Callback(Database db, DBResultSet results, const char[]
 		// 2 - jumps
 		int style = results.FetchInt(3);
 		int jumps = results.FetchInt(2);
+		float perfs = results.FetchFloat(9);
 
-		if(gA_StyleSettings[style][bAutobhop])
+		if(gA_StyleSettings[style][bAutobhop] && perfs > 0.0)
 		{
 			FormatEx(sDisplay, 128, "%T: %d", "WRJumps", client, jumps);
 		}
 
 		else
 		{
-			float perfs = results.FetchFloat(9);
 			FormatEx(sDisplay, 128, "%T: %d (%.2f%%)", "WRJumps", client, jumps, perfs);
 		}