Skip to content

Commit ee82b0f

Browse files
committed
[ChatAntiSpam] Fix database deadlock warning while muted by both checks and score
1 parent 4079b79 commit ee82b0f

File tree

1 file changed

+5
-1
lines changed
  • bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/chatantispam

1 file changed

+5
-1
lines changed

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/chatantispam/CasListeners.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ object CasListeners: Listener {
100100
var scoreValue = 0.0
101101
var scoreBy = "pass"
102102
var mergeScoreValue = false
103+
var muted = false
103104
for (check in ChecksMan.checks) {
104105
val (filter, score, mergeScore, notify, addFilter, mute, block, endChecks) = check.check(request)
105106
if (filter != null) {
@@ -108,6 +109,7 @@ object CasListeners: Listener {
108109
}
109110
if (mute) {
110111
handleMuted(player, spamData)
112+
muted = true
111113
}
112114
if (scoreValue < 0 || score < 0) {
113115
scoreValue = min(scoreValue, score)
@@ -169,6 +171,7 @@ object CasListeners: Listener {
169171
addFilter = false
170172
)
171173
handleMuted(player, spamData)
174+
muted = true
172175
blockValue = true
173176
}
174177
}
@@ -184,6 +187,8 @@ object CasListeners: Listener {
184187
} else {
185188
spamData.consecutiveUnfiltered.store(0)
186189
}
190+
if (muted)
191+
CasDataManager.saveSpamDataAsync(user)
187192
return blockValue
188193
}
189194

@@ -217,7 +222,6 @@ object CasListeners: Listener {
217222
unparsed("multiplier", String.format("%.1f", spamData.muteMultiplier)),
218223
)
219224
}
220-
CasDataManager.saveSpamDataAsync(player.user)
221225
}
222226

223227
fun <T> ArrayDeque<T>.sizedAdd(fullOn: Int, obj: T): ArrayDeque<T> {

0 commit comments

Comments
 (0)