lock commanda

server/dungeonsandtrolls/game.go

@@ -35,6 +35,7 @@ type Game struct {
 	MaxLevelReached int32                         `json:"max_reached_level"`
 	Game            api.GameState                 `json:"-"`
 	GameLock        sync.RWMutex                  `json:"-"`
+	CommandsLock    sync.RWMutex                  `json:"-"`
 	TickCond        *sync.Cond                    `json:"-"`
 
 	generatorLock sync.RWMutex
@@ -309,7 +310,9 @@ func (g *Game) MarkVisitedLevel(level int32) {
 }
 
 func (g *Game) Respawn(player *gameobject.Player, markDeath bool) {
+	g.CommandsLock.RLock()
 	g.Commands[player.GetId()] = &api.CommandsBatch{}
+	g.CommandsLock.RUnlock()
 	player.SetMovingTo(nil)
 
 	if markDeath {
@@ -951,10 +954,17 @@ func (g *Game) GetCurrentPlayer(token string) (*gameobject.Player, error) {
 }
 
 func (g *Game) GetCommands(pId string) *api.CommandsBatch {
+	g.CommandsLock.RLock()
 	if pc, ok := g.Commands[pId]; ok {
+		g.CommandsLock.RUnlock()
 		return pc
 	}
+	g.CommandsLock.RUnlock()
+
+	g.CommandsLock.Lock()
 	g.Commands[pId] = &api.CommandsBatch{}
+	defer g.CommandsLock.Unlock()
+
 	return g.Commands[pId]
 }
 

server/dungeonsandtrolls/handlers/commands.go

@@ -59,11 +59,13 @@ func Commands(game *dungeonsandtrolls.Game, c *api.CommandsBatch, token string)
 	}
 
 	pc := game.GetCommands(p.Character.Id)
+	game.CommandsLock.Lock()
 	pc.Yell = c.Yell
 	pc.Buy = c.Buy
 	pc.PickUp = c.PickUp
 	pc.Skill = c.Skill
 	pc.AssignSkillPoints = c.AssignSkillPoints
+	game.CommandsLock.Unlock()
 
 	return nil
 }

server/dungeonsandtrolls/handlers/monster_commands.go

@@ -57,8 +57,10 @@ func validateMonsterCommands(game *dungeonsandtrolls.Game, mc *api.CommandsForMo
 		}
 
 		pc := game.GetCommands(mId)
+		game.CommandsLock.Lock()
 		pc.Yell = c.Yell
 		pc.Skill = c.Skill
+		game.CommandsLock.Unlock()
 	}
 	return nil
 }