Skip to content

Commit 9a2ee0b

Browse files
committed
[bugfix] Fix missing fields in referee message
1 parent 31b9162 commit 9a2ee0b

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

internal/app/controller/publisher.go

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type Publisher struct {
1717
}
1818

1919
type RefMessage struct {
20-
referee refproto.Referee
20+
referee *refproto.Referee
2121
send func()
2222
}
2323

@@ -39,9 +39,9 @@ func NewPublisher(address string) (publisher Publisher, err error) {
3939
log.Println("Publishing to", address)
4040

4141
publisher.conn = conn
42-
publisher.message = RefMessage{send: publisher.send}
42+
publisher.message = RefMessage{send: publisher.send, referee: new(refproto.Referee)}
4343

44-
initRefereeMessage(&publisher.message.referee)
44+
initRefereeMessage(publisher.message.referee)
4545

4646
return
4747
}
@@ -89,7 +89,7 @@ func (p *Publisher) send() {
8989
return
9090
}
9191

92-
bytes, err := proto.Marshal(&p.message.referee)
92+
bytes, err := proto.Marshal(p.message.referee)
9393
if err != nil {
9494
log.Printf("Could not marshal referee message: %v\nError: %v", p.message, err)
9595
return
@@ -101,17 +101,15 @@ func (p *Publisher) send() {
101101
}
102102

103103
func (p *RefMessage) setState(state *State) (republish bool) {
104-
r := &p.referee
104+
p.referee.GameEvents = mapGameEvents(state.GameEvents)
105+
p.referee.DesignatedPosition = mapLocation(state.PlacementPos)
105106

106-
r.GameEvents = mapGameEvents(state.GameEvents)
107-
r.DesignatedPosition = mapLocation(state.PlacementPos)
108-
109-
*r.PacketTimestamp = uint64(time.Now().UnixNano() / 1000)
110-
*r.Stage = mapStage(state.Stage)
111-
*r.StageTimeLeft = int32(state.StageTimeLeft.Nanoseconds() / 1000)
112-
*r.BlueTeamOnPositiveHalf = state.TeamState[TeamBlue].OnPositiveHalf
113-
updateTeam(r.Yellow, state.TeamState[TeamYellow])
114-
updateTeam(r.Blue, state.TeamState[TeamBlue])
107+
*p.referee.PacketTimestamp = uint64(time.Now().UnixNano() / 1000)
108+
*p.referee.Stage = mapStage(state.Stage)
109+
*p.referee.StageTimeLeft = int32(state.StageTimeLeft.Nanoseconds() / 1000)
110+
*p.referee.BlueTeamOnPositiveHalf = state.TeamState[TeamBlue].OnPositiveHalf
111+
updateTeam(p.referee.Yellow, state.TeamState[TeamYellow])
112+
updateTeam(p.referee.Blue, state.TeamState[TeamBlue])
115113
return
116114
}
117115

0 commit comments

Comments
 (0)