Disable OC1 timer when detecting OC 2 data.

Author: DeKleineKobini

extension/changelog.json

@@ -3,7 +3,7 @@
 		"version": { "major": 7, "minor": 4, "build": 3 },
 		"title": "Beta",
 		"date": false,
-		"logs": { "features": [{ "message": "Sidebar timer for OC 2.", "contributor": "DeKleineKobini" }], "fixes": [], "changes": [], "removed": [] }
+		"logs": { "features": [{ "message": "Sidebar timer for OC 2.", "contributor": "DeKleineKobini" }], "fixes": [], "changes": [{ "message": "Disable OC1 timer when detecting OC 2 data.", "contributor": "DeKleineKobini" }], "removed": [] }
 	},
 	{
 		"version": { "major": 7, "minor": 4, "build": 2 },

extension/scripts/features/oc-time/ttOCTime.js

@@ -7,7 +7,7 @@
 	featureManager.registerFeature(
 		"OC Time",
 		"sidebar",
-		() => settings.pages.sidebar.ocTimer && (userdata?.faction?.faction_id > 0 ?? false),
+		() => settings.pages.sidebar.ocTimer && (userdata?.faction?.faction_id > 0 ?? false) && !userdata.organizedCrime,
 		null,
 		showTimer,
 		removeTimer,
@@ -16,6 +16,7 @@
 		},
 		() => {
 			if (!hasAPIData() || !((settings.apiUsage.user.icons && userdata.userCrime) || factiondata.userCrime)) return "No API access.";
+			else if (!userdata.organizedCrime) return "No OC 1 data.";
 		}
 	);