|
@@ -417,6 +417,7 @@ func (p *Game) Leave(playerID int32) error {
|
|
|
|
|
|
func (p *Game) ChooseRndChair(playerID int32) error {
|
|
|
p.locker.Lock()
|
|
|
+ defer p.locker.Unlock()
|
|
|
|
|
|
p.EventInfo(playerID, "随机选桌子", "开始")
|
|
|
|
|
@@ -458,20 +459,19 @@ func (p *Game) ChooseRndChair(playerID int32) error {
|
|
|
if maxRoomID != -1 && maxChairID != -1 {
|
|
|
p.EventInfo(playerID, "随机选桌子", fmt.Sprintf("找到桌子:%d-%d", maxRoomID, maxChairID))
|
|
|
|
|
|
- p.locker.Unlock()
|
|
|
- return p.ChooseChair(playerID, int32(maxRoomID), int32(maxChairID), "")
|
|
|
+ return p.ChooseChair(playerID, int32(maxRoomID), int32(maxChairID), "", false)
|
|
|
}
|
|
|
|
|
|
p.EventInfo(playerID, "随机选桌子", "没有找到桌子")
|
|
|
|
|
|
- p.locker.Unlock()
|
|
|
-
|
|
|
return ErrNotFound
|
|
|
}
|
|
|
|
|
|
-func (p *Game) ChooseChair(playerID int32, roomID int32, chairID int32, passwd string) error {
|
|
|
- p.locker.Lock()
|
|
|
- defer p.locker.Unlock()
|
|
|
+func (p *Game) ChooseChair(playerID int32, roomID int32, chairID int32, passwd string, userLock bool) error {
|
|
|
+ if userLock {
|
|
|
+ p.locker.Lock()
|
|
|
+ defer p.locker.Unlock()
|
|
|
+ }
|
|
|
|
|
|
p.EventInfo(playerID, "选桌子", "开始")
|
|
|
|