You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: application/models/Additional_data.php
+3-3
Original file line number
Diff line number
Diff line change
@@ -629,11 +629,11 @@ public function get_ops_to_fix_data($verified = false, $op_ids_with_unambiguous_
629
629
FROM events AS e
630
630
INNER JOIN entities AS victim ON victim.aid = e.victim_aid
631
631
LEFT JOIN (
632
-
SELECT ee.operation_id, ee.victim_id, frame
632
+
SELECT ee.operation_id, ee.victim_id, ee.frame
633
633
FROM events AS ee
634
634
WHERE ee.victim_id = ee.attacker_id AND ee.victim_id IS NOT NULL AND ee.event = 'hit'
635
635
GROUP BY ee.operation_id, ee.victim_id
636
-
) AS hits ON hits.operation_id = e.operation_id AND hits.victim_id = e.victim_id AND hits.frame = e.frame
636
+
) AS hits ON hits.operation_id = e.operation_id AND hits.victim_id = e.victim_id AND (hits.frame = e.frame OR hits.frame = e.frame - 1 OR hits.frame = e.frame + 1)
637
637
WHERE e.victim_aid = e.attacker_aid AND hits.victim_id IS NULL AND victim.is_player = 1 AND e.event = 'killed'
638
638
) AS sus_suicide_events
639
639
GROUP BY sus_suicide_events.operation_id
@@ -668,7 +668,7 @@ public function get_op_sus_suicides($id)
668
668
FROM events AS ee
669
669
WHERE ee.victim_id = ee.attacker_id AND ee.victim_id IS NOT NULL AND ee.event = 'hit'
670
670
GROUP BY ee.operation_id, ee.victim_id
671
-
) AS hits", 'hits.operation_id = e.operation_id AND hits.victim_id = e.victim_id AND hits.frame = e.frame', 'LEFT')
671
+
) AS hits", 'hits.operation_id = e.operation_id AND hits.victim_id = e.victim_id AND (hits.frame = e.frame OR hits.frame = e.frame - 1 OR hits.frame = e.frame + 1)', 'LEFT')
672
672
->where("e.victim_aid = e.attacker_aid AND hits.victim_id IS NULL AND victim.is_player = 1 AND e.event = 'killed'")
0 commit comments