fix: site detection

redraskal · Jul 21, 2024 · 6474620 · 6474620
1 parent ebad550
commit 6474620
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/dissect/player.go b/dissect/player.go
@@ -141,7 +141,11 @@ func readPlayer(r *Reader) error {
 			r.Header.Players[i].ProfileID = p.ProfileID
 			r.Header.Players[i].Username = p.Username
 			r.Header.Players[i].Operator = p.Operator
-			r.Header.Players[i].Spawn = p.Spawn
+
+			if p.Operator == Recruit || p.Operator.Role() != Defense {
+				r.Header.Players[i].Spawn = p.Spawn
+			}
+
 			r.Header.Players[i].DissectID = p.DissectID
 			found = true
 			break

diff --git a/dissect/site.go b/dissect/site.go
@@ -25,7 +25,7 @@ func readSpawn(r *Reader) error {
 		Int("flag", flag).
 		Str("site", location).
 		Msg("site")
-	if r.Header.Site == "" && flag == 1 || flag == 164 {
+	if r.Header.Site == "" && (flag == 1 || flag == 164) {
 		formatted := strings.Replace(location, "<br/>", ", ", 1)
 		log.Debug().Str("site", formatted).Msg("defense site")
 		for i, p := range r.Header.Players {