Fix some wearables not removed properly

FortyTwoFortyTwo · May 22, 2023 · b52fbad · b52fbad
1 parent 1e28ae7
commit b52fbad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/scripting/randomizer.sp b/scripting/randomizer.sp
@@ -560,7 +560,7 @@ public void OnGameFrame()
 
 			if (IsValidEntity(iEntity))
 			{
-				RemoveEntity(iEntity);
+				TF2_RemoveItem(GetEntPropEnt(iEntity, Prop_Send, "m_hOwnerEntity"), iEntity, true);
 				break;
 			}
 		}

diff --git a/scripting/randomizer/stocks.sp b/scripting/randomizer/stocks.sp
@@ -468,7 +468,7 @@ stock float TF2_GetMultiMaxAmmo(float flInitial, int iAmmoType, int iEntity)
 	}
 }
 
-stock void TF2_RemoveItem(int iClient, int iWeapon)
+stock void TF2_RemoveItem(int iClient, int iWeapon, bool bForce = false)
 {
 	if (TF2_IsWearable(iWeapon))
 	{
@@ -479,18 +479,22 @@ stock void TF2_RemoveItem(int iClient, int iWeapon)
 
 	//Below similar to TF2_RemoveWeaponSlot, but only removes 1 weapon instead of all weapons in 1 slot
 
+	RemovePlayerItem(iClient, iWeapon);
+
+	if (!bForce)
+	{
+		//Add to list to remove later instead of removing all weapons at once
+		g_aEntityToRemove.Push(EntIndexToEntRef(iWeapon));
+		return;
+	}
+
 	int iExtraWearable = GetEntPropEnt(iWeapon, Prop_Send, "m_hExtraWearable");
 	if (iExtraWearable != -1)
 		TF2_RemoveWearable(iClient, iExtraWearable);
 
 	iExtraWearable = GetEntPropEnt(iWeapon, Prop_Send, "m_hExtraWearableViewModel");
 	if (iExtraWearable != -1)
 		TF2_RemoveWearable(iClient, iExtraWearable);
-
-	RemovePlayerItem(iClient, iWeapon);
-
-	//Add to list to remove later instead of removing all weapons at once
-	g_aEntityToRemove.Push(EntIndexToEntRef(iWeapon));
 }
 
 stock void TF2_AddConditionFake(int iClient, TFCond nCond)