Disable Faction OC timer when detecting OC 2 data.

Mephiles · Jan 17, 2025 · 328fad0 · 328fad0
1 parent c894af5
commit 328fad0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/extension/changelog.json b/extension/changelog.json
@@ -6,7 +6,10 @@
 		"logs": {
 			"features": [{ "message": "Sidebar timer for OC 2.", "contributor": "DeKleineKobini" }],
 			"fixes": [],
-			"changes": [{ "message": "Disable OC1 timer when detecting OC 2 data.", "contributor": "DeKleineKobini" }],
+			"changes": [
+				{ "message": "Disable OC1 timer when detecting OC 2 data.", "contributor": "DeKleineKobini" },
+				{ "message": "Disable Faction OC timer when detecting OC 2 data.", "contributor": "DeKleineKobini" }
+			],
 			"removed": []
 		}
 	},

diff --git a/extension/scripts/features/faction-oc-time/ttFactionOCTime.js b/extension/scripts/features/faction-oc-time/ttFactionOCTime.js
@@ -16,6 +16,7 @@
 		},
 		() => {
 			if (!hasAPIData() || !factiondata.crimes) return "No API access.";
+			else if (!!userdata.organizedCrime) return "No OC 1 data.";
 		}
 	);
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ @@
     		},
     		() => {
     			if (!hasAPIData() || !factiondata.crimes) return "No API access.";
+    			else if (!!userdata.organizedCrime) return "No OC 1 data.";
     		}
     	);
@@ Expand Down @@