use references

Author: y21

http/gateway/coordinate_change.go

@@ -44,7 +44,7 @@ func CoordinateChangeEventCallback(c *WebSocketConnection, d *AnyMessage) {
 p.AntiCheatFlags += utils.Penalize(utils.ActionCoordinateDrift, int(yDrift))
 }
 
-kicked := c.HandleAntiCheatFlags(&r, p.AntiCheatFlags)
+kicked := c.HandleAntiCheatFlags(r, p.AntiCheatFlags)
 if kicked {
 return
 }

http/gateway/handler.go

@@ -39,7 +39,7 @@ func Handle(c *websocket.Conn) {
 err := c.ReadJSON(&msg)
 if err != nil {
 fmt.Println(err)
-handleClose(&ws)
+//handleClose(&ws)
 break
 }
 
@@ -51,7 +51,7 @@ func Handle(c *websocket.Conn) {
 case OpEvent:
 handleEvent(&ws, &msg)
 case OpClose:
-handleClose(&ws)
+//handleClose(&ws)
 break
 }
 }
@@ -64,23 +64,20 @@ func handleHello(c *WebSocketConnection, d *AnyMessage) {
 }
 sessionID, ok := d.Data["session"].(string)
 
-fmt.Println("event data", d.Data)
-
 r, ok := room.Rooms[roomID]
 if !ok {
 return
 }
-fmt.Println("room", r)
 
 if len(r.Players) >= room.PlayerLimit {
-c.Kick(&r, RoomFullKick, "Too many players online")
+c.Kick(r, RoomFullKick, "Too many players online")
 return
 }
 
 if r.Mode == room.EliminationMode &&
 r.State != room.CountdownState &&
 r.State != room.WaitingState {
-c.Kick(&r, RoomIngameKick, "Room is already in-game")
+c.Kick(r, RoomIngameKick, "Room is already in-game")
 return
 }
 
@@ -112,11 +109,12 @@ func handleHello(c *WebSocketConnection, d *AnyMessage) {
 return
 }
 
-r.Players = append(r.Players, p)
+r.Players = append(r.Players, &p)
 
 // TODO: check if room is elimination room and if it meets requirements for room start
 
 // TODO: send room data to client
+fmt.Println(r)
 }
 
 func handleHeartbeat(c *WebSocketConnection, d *AnyMessage) {

http/gateway/item_collect.go

@@ -30,7 +30,7 @@ func ItemCollectEventCallback(c *WebSocketConnection, d *AnyMessage) {
 
 var targetItem *item.Item
 for i := range r.Items {
-currentItem := &r.Items[i]
+currentItem := r.Items[i]
 if currentItem.ID == itemID &&
 p.X < (currentItem.X+item.ItemWidth) &&
 p.X > (currentItem.X-item.ItemWidth) &&

http/gateway/nom_key.go

@@ -30,7 +30,7 @@ func NomKeyEventCallback(c *WebSocketConnection, d *AnyMessage) {
 }
 
 for i := range r.Players {
-target := &r.Players[i]
+target := r.Players[i]
 
 if (p.X > (target.X+player.Height) || p.X < (target.X-player.Height)) || (p.Y > (target.Y+player.Height) || p.Y < (target.Y-player.Height)) {
 return

http/gateway/player_kick.go

@@ -38,7 +38,7 @@ func PlayerKickEventCallback(c *WebSocketConnection, d *AnyMessage) {
 }
 
 if p.Role != user.AdminRole {
-c.Kick(&r, ClientModKick, "Insufficient permissions")
+c.Kick(r, ClientModKick, "Insufficient permissions")
 return
 }
 
@@ -51,5 +51,5 @@ func PlayerKickEventCallback(c *WebSocketConnection, d *AnyMessage) {
 if !ok {
 return
 }
-conn.Kick(&r, ModKick, reason)
+conn.Kick(r, ModKick, reason)
 }

main.go

@@ -46,7 +46,7 @@ func main() {
 }
 
 // Create rooms
-room.Rooms = make(map[string]room.Room)
+room.Rooms = make(map[string]*room.Room)
 for i := 0; i < 3; i++ {
 room.New(room.FFAMode)
 room.New(room.EliminationMode)

models/room/room.go

@@ -36,19 +36,19 @@ const (
 
 type Room struct {
 // Base
-Map gamemap.GameMap `json:"map"`
-ID string `json:"id"`
-Players []player.Player `json:"players"`
-Items []item.Item `json:"items"`
-Mode uint8 `json:"mode"`
-State uint8 `json:"state"`
-CreatedAt int64 `json:"createdAt"`
+Map gamemap.GameMap  `json:"map"`
+ID string  `json:"id"`
+Players []*player.Player `json:"players"`
+Items []*item.Item `json:"items"`
+Mode uint8  `json:"mode"`
+State uint8  `json:"state"`
+CreatedAt int64  `json:"createdAt"`
 
 // Elimination room
 CountdownStarted int64 `json:"countdownStarted,omitempty"`
 }
 
-var Rooms map[string]Room
+var Rooms map[string]*Room
 
 func New(mode uint8) *Room {
 r := Room{
@@ -59,10 +59,10 @@ func New(mode uint8) *Room {
 
 // TODO: custom maps?
 r.Map = gamemap.GameMaps["default"]
-r.Players = make([]player.Player, 0)
-r.Items = make([]item.Item, 0)
+r.Players = make([]*player.Player, 0)
+r.Items = make([]*item.Item, 0)
 
-Rooms[r.ID] = r
+Rooms[r.ID] = &r
 
 return &r
 }
@@ -103,7 +103,7 @@ func (r *Room) GenerateGuestName() string {
 func (r *Room) GetPlayerByUsername(username string) *player.Player {
 for i, p := range r.Players {
 if p.Username == username {
-return &r.Players[i]
+return r.Players[i]
 }
 }
 return nil
@@ -112,7 +112,7 @@ func (r *Room) GetPlayerByUsername(username string) *player.Player {
 func (r *Room) GetPlayerByWebSocketID(id string) *player.Player {
 for i, p := range r.Players {
 if p.ID == id {
-return &r.Players[i]
+return r.Players[i]
 }
 }
 return nil