Fixed Juggernout restore model crash

azalty · azalty · commit aff31939b0b9 · 2023-07-15T00:25:28.000+02:00
diff --git a/addons/sourcemod/plugins/sm_hosties_e.smx b/addons/sourcemod/plugins/sm_hosties_e.smx
diff --git a/addons/sourcemod/scripting/hosties/lastrequest.sp b/addons/sourcemod/scripting/hosties/lastrequest.sp
@@ -84,7 +84,7 @@ char 	LR_C_sWeapon[MAXPLAYERS + 1][11][64];
 int 	LR_C_WeaponCount[MAXPLAYERS + 1] = {0, ...};
 int 	LR_C_FlashCounter[MAXPLAYERS + 1] = {0, ...};
 
-char	BeforeModel[MAXPLAYERS+1][PLATFORM_MAX_PATH],
+char	BeforeModel[MAXPLAYERS+1][PLATFORM_MAX_PATH+1],
 		g_sLastRequestPhrase[BASE_LR_Number][MAX_DISPLAYNAME_SIZE];
 
 ConVar	g_hRoundTime,
@@ -1352,7 +1352,7 @@ void CleanupLastRequest(int loser, int arrayIndex)
 					if (strlen(BeforeModel[LR_Player_Prisoner]) > 0)
 					{
 						SetEntityModel(LR_Player_Prisoner, BeforeModel[LR_Player_Prisoner]);
-						FormatEx(BeforeModel[LR_Player_Prisoner], sizeof(BeforeModel), "");
+						FormatEx(BeforeModel[LR_Player_Prisoner], sizeof(BeforeModel[]), "");
 					}
 				}
 			}
@@ -1367,7 +1367,7 @@ void CleanupLastRequest(int loser, int arrayIndex)
 					if (strlen(BeforeModel[LR_Player_Guard]) > 0)
 					{
 						SetEntityModel(LR_Player_Guard, BeforeModel[LR_Player_Guard]);
-						FormatEx(BeforeModel[LR_Player_Guard], sizeof(BeforeModel), "");
+						FormatEx(BeforeModel[LR_Player_Guard], sizeof(BeforeModel[]), "");
 					}
 				}
 			}
@@ -4015,8 +4015,8 @@ void InitializeGame(int iPartnersIndex)
 		{
 			if (GetEngineVersion() == Engine_CSGO)
 			{
-				GetEntPropString(LR_Player_Prisoner, Prop_Data, "m_ModelName", BeforeModel[LR_Player_Prisoner], sizeof(BeforeModel));
-				GetEntPropString(LR_Player_Guard, Prop_Data, "m_ModelName", BeforeModel[LR_Player_Guard], sizeof(BeforeModel));
+				GetEntPropString(LR_Player_Prisoner, Prop_Data, "m_ModelName", BeforeModel[LR_Player_Prisoner], sizeof(BeforeModel[]));
+				GetEntPropString(LR_Player_Guard, Prop_Data, "m_ModelName", BeforeModel[LR_Player_Guard], sizeof(BeforeModel[]));
 			
 				if (g_cvSvSuit == INVALID_HANDLE)
 					g_cvSvSuit = FindConVar("mp_weapons_allow_heavyassaultsuit");
diff --git a/addons/sourcemod/scripting/sm_hosties_e.sp b/addons/sourcemod/scripting/sm_hosties_e.sp
@@ -44,7 +44,7 @@
 
 #pragma			semicolon 					1
 
-#define 		PLUGIN_VERSION				"5.0.4"
+#define 		PLUGIN_VERSION				"5.0.5"
 #define 		PLUGIN_NAME					"Hosties+"
 #define 		MAX_DISPLAYNAME_SIZE		64
 #define 		MAX_DATAENTRY_SIZE			5

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ char LR_C_sWeapon[MAXPLAYERS + 1][11][64];`
`84`	`84`	`int LR_C_WeaponCount[MAXPLAYERS + 1] = {0, ...};`
`85`	`85`	`int LR_C_FlashCounter[MAXPLAYERS + 1] = {0, ...};`
`86`	`86`
`87`		`-char BeforeModel[MAXPLAYERS+1][PLATFORM_MAX_PATH],`
	`87`	`+char BeforeModel[MAXPLAYERS+1][PLATFORM_MAX_PATH+1],`
`88`	`88`	`g_sLastRequestPhrase[BASE_LR_Number][MAX_DISPLAYNAME_SIZE];`
`89`	`89`
`90`	`90`	`ConVar g_hRoundTime,`
`@@ -1352,7 +1352,7 @@ void CleanupLastRequest(int loser, int arrayIndex)`
`1352`	`1352`	`if (strlen(BeforeModel[LR_Player_Prisoner]) > 0)`
`1353`	`1353`	`{`
`1354`	`1354`	`SetEntityModel(LR_Player_Prisoner, BeforeModel[LR_Player_Prisoner]);`
`1355`		`- FormatEx(BeforeModel[LR_Player_Prisoner], sizeof(BeforeModel), "");`
	`1355`	`+ FormatEx(BeforeModel[LR_Player_Prisoner], sizeof(BeforeModel[]), "");`
`1356`	`1356`	`}`
`1357`	`1357`	`}`
`1358`	`1358`	`}`
`@@ -1367,7 +1367,7 @@ void CleanupLastRequest(int loser, int arrayIndex)`
`1367`	`1367`	`if (strlen(BeforeModel[LR_Player_Guard]) > 0)`
`1368`	`1368`	`{`
`1369`	`1369`	`SetEntityModel(LR_Player_Guard, BeforeModel[LR_Player_Guard]);`
`1370`		`- FormatEx(BeforeModel[LR_Player_Guard], sizeof(BeforeModel), "");`
	`1370`	`+ FormatEx(BeforeModel[LR_Player_Guard], sizeof(BeforeModel[]), "");`
`1371`	`1371`	`}`
`1372`	`1372`	`}`
`1373`	`1373`	`}`
`@@ -4015,8 +4015,8 @@ void InitializeGame(int iPartnersIndex)`
`4015`	`4015`	`{`
`4016`	`4016`	`if (GetEngineVersion() == Engine_CSGO)`
`4017`	`4017`	`{`
`4018`		`- GetEntPropString(LR_Player_Prisoner, Prop_Data, "m_ModelName", BeforeModel[LR_Player_Prisoner], sizeof(BeforeModel));`
`4019`		`- GetEntPropString(LR_Player_Guard, Prop_Data, "m_ModelName", BeforeModel[LR_Player_Guard], sizeof(BeforeModel));`
	`4018`	`+ GetEntPropString(LR_Player_Prisoner, Prop_Data, "m_ModelName", BeforeModel[LR_Player_Prisoner], sizeof(BeforeModel[]));`
	`4019`	`+ GetEntPropString(LR_Player_Guard, Prop_Data, "m_ModelName", BeforeModel[LR_Player_Guard], sizeof(BeforeModel[]));`
`4020`	`4020`
`4021`	`4021`	`if (g_cvSvSuit == INVALID_HANDLE)`
`4022`	`4022`	`g_cvSvSuit = FindConVar("mp_weapons_allow_heavyassaultsuit");`