fix: Chunks are now goroutine safe

- added Chunk.ForEachEntity()
- refactored SendPacketExclude() to use it
- Chunk.Entities is now Chunk.entities, which is private.
- Chunk.AddEntity() && RemoveEntity() now lock the chunk mutex
This commit is contained in:
CPunch 2023-11-21 01:49:57 -06:00
parent 06f4a4d33f
commit 459b71a109
2 changed files with 35 additions and 14 deletions

View File

@ -7,23 +7,29 @@ import (
type Chunk struct {
Position ChunkPosition
Entities map[Entity]struct{}
entities map[Entity]struct{}
lock sync.Mutex
}
func NewChunk(position ChunkPosition) *Chunk {
return &Chunk{
Position: position,
Entities: make(map[Entity]struct{}),
entities: make(map[Entity]struct{}),
}
}
func (c *Chunk) AddEntity(entity Entity) {
c.Entities[entity] = struct{}{}
c.lock.Lock()
defer c.lock.Unlock()
c.entities[entity] = struct{}{}
}
func (c *Chunk) RemoveEntity(entity Entity) {
delete(c.Entities, entity)
c.lock.Lock()
defer c.lock.Unlock()
delete(c.entities, entity)
}
// send packet to all peers in this chunk and kill each peer if error
@ -31,14 +37,23 @@ func (c *Chunk) SendPacket(typeID uint32, pkt ...interface{}) {
c.SendPacketExclude(nil, typeID, pkt...)
}
func (c *Chunk) SendPacketExclude(exclude Entity, typeID uint32, pkt ...interface{}) {
// calls f for each entity in this chunk, if f returns true, stop iterating
func (c *Chunk) ForEachEntity(f func(entity Entity) bool) {
c.lock.Lock()
defer c.lock.Unlock()
for entity := range c.Entities {
for entity := range c.entities {
if f(entity) {
break
}
}
}
func (c *Chunk) SendPacketExclude(exclude Entity, typeID uint32, pkt ...interface{}) {
c.ForEachEntity(func(entity Entity) bool {
// only send to players, and exclude the player that sent the packet
if entity.GetKind() != ENTITY_KIND_PLAYER || entity == exclude {
continue
return false
}
plr, ok := entity.(*Player)
@ -51,7 +66,9 @@ func (c *Chunk) SendPacketExclude(exclude Entity, typeID uint32, pkt ...interfac
log.Printf("Error sending packet to peer %p: %v", peer, err)
peer.Kill()
}
}
return false
})
}
func (c *Chunk) GetAdjacentPositions() []ChunkPosition {

View File

@ -58,9 +58,9 @@ func (server *ShardServer) sendAllPacket(plr *entity.Player, typeID uint32, pkt
func (server *ShardServer) removeEntityFromChunks(this entity.Entity, chunks []*entity.Chunk) {
for _, chunk := range chunks {
for e := range chunk.Entities {
chunk.ForEachEntity(func(e entity.Entity) bool {
if e == this {
continue
return false
}
// notify other players we're leaving
@ -74,15 +74,17 @@ func (server *ShardServer) removeEntityFromChunks(this entity.Entity, chunks []*
thisPlr := this.(*entity.Player)
e.DisappearFromViewOf(thisPlr.Peer)
}
}
return false
})
}
}
func (server *ShardServer) addEntityToChunks(this entity.Entity, chunks []*entity.Chunk) {
for _, chunk := range chunks {
for e := range chunk.Entities {
chunk.ForEachEntity(func(e entity.Entity) bool {
if e == this {
continue
return false
}
// notify other players we're entering
@ -96,7 +98,9 @@ func (server *ShardServer) addEntityToChunks(this entity.Entity, chunks []*entit
thisPlr := this.(*entity.Player)
e.EnterIntoViewOf(thisPlr.Peer)
}
}
return false
})
}
}