Code Refactoring:Fixed potential bug in aggregate monitoring, ensurin…

…g no interference when aggregate monitoring is turned off.

.github/workflows/release.yml

@@ -34,5 +34,5 @@ jobs:
         uses: marvinpinto/action-automatic-releases@latest
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          files: build/libs/ISeeYou-*-all.jar
+          files: build/libs/ISeeYou-Fork-*-all.jar
           prerelease: false

settings.gradle.kts

@@ -1,4 +1,4 @@
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
-rootProject.name = "ISeeYou"
+rootProject.name = "ISeeYou-Fork"

src/main/java/xaviermc/top/iseeyou/ConfigData.kt

@@ -65,7 +65,7 @@ data class RecordSuspiciousPlayerConfig(
     var enableMatrixIntegration: Boolean = false,
     var aggregateMonitoring: Boolean = false,
     var recordMinutes: Long = 5,
-    var recordPath: String = "replay/suspicious/Themis/\${name}@\${uuid}",
+    var recordPath: String = "replay/suspicious/\${name}@\${uuid}",
     var themisRecordPath: String = "replay/suspicious/Themis/\${name}@\${uuid}",
     var matrixRecordPath: String = "replay/suspicious/Matrix/\${name}@\${uuid}"
 )

src/main/java/xaviermc/top/iseeyou/anticheat/AntiCheatListener.kt

@@ -14,7 +14,6 @@ import java.time.Duration
 import java.time.LocalDateTime
 import java.util.*
 
-
 val suspiciousPhotographers: MutableMap<String, SuspiciousPhotographer> = mutableMapOf()
 
 object AntiCheatListener : Listener {
@@ -38,7 +37,25 @@ object AntiCheatListener : Listener {
 
     fun onAntiCheatAction(player: Player, source: String? = null) {
         Bukkit.getScheduler().runTask(instance!!, Runnable {
-            val photographerName = (player.name + "_sus_" + UUID.randomUUID().toString().replace("-", "")).substring(0, 16)
+            val photographerName = if (toml!!.data.recordSuspiciousPlayer.aggregateMonitoring) {
+                val name = "Sus_${player.name}_${source ?: ""}_${UUID.randomUUID().toString().replace("-", "")}"
+                name.substring(0, 16)
+            } else {
+                val prefix = when (source) {
+                    "Themis" -> "Th"
+                    "Matrix" -> "Ma"
+                    else -> throw IllegalArgumentException("Unknown source: $source")
+                }
+                val name = "$prefix${player.name}_${UUID.randomUUID().toString().replace("-", "")}"
+                name.substring(0, 16)
+            }
+
+            val existingPhotographer = suspiciousPhotographers[player.name + source]
+            if (existingPhotographer != null) {
+                existingPhotographer.lastTagged = System.currentTimeMillis()
+                return@Runnable
+            }
+
             val photographer = Bukkit.getPhotographerManager().createPhotographer(photographerName, player.location)
 
             if (photographer == null) {
@@ -48,13 +65,13 @@ object AntiCheatListener : Listener {
             photographer.setFollowPlayer(player)
             val currentTime = LocalDateTime.now()
             val recordPath: String = if (toml!!.data.recordSuspiciousPlayer.aggregateMonitoring) {
+                toml!!.data.recordSuspiciousPlayer.recordPath
+            } else {
                 when (source) {
                     "Themis" -> toml!!.data.recordSuspiciousPlayer.themisRecordPath
                     "Matrix" -> toml!!.data.recordSuspiciousPlayer.matrixRecordPath
                     else -> throw IllegalArgumentException("Unknown source: $source")
                 }
-            } else {
-                toml!!.data.recordSuspiciousPlayer.recordPath
             }
                 .replace("\${name}", player.name)
                 .replace("\${uuid}", player.uniqueId.toString())
@@ -65,13 +82,13 @@ object AntiCheatListener : Listener {
                 recordFile.delete()
             }
             recordFile.createNewFile()
-            photographer.setRecordFile(recordFile)
-            suspiciousPhotographers[player.name] = SuspiciousPhotographer(
+            val suspiciousPhotographer = SuspiciousPhotographer(
                 photographer = photographer,
                 name = player.name,
                 lastTagged = System.currentTimeMillis(),
-                source = source
+                source = source,
             )
+            suspiciousPhotographers[player.name + source] = suspiciousPhotographer
         })
     }
 

src/main/java/xaviermc/top/iseeyou/anticheat/SuspiciousPhotographer.kt

@@ -5,6 +5,8 @@ import top.leavesmc.leaves.entity.Photographer
 data class SuspiciousPhotographer(
     val photographer: Photographer,
     val name: String,
-    val lastTagged: Long,
+//    var matrixlastTagged: Long,
+//    var themislastTagged: Long,
+    var lastTagged: Long,
     val source: String? = null
 )