refactor: Remove reverted mutex changes

server/channelserver/handlers_stage.go

@@ -55,7 +55,6 @@ func doStageTransfer(s *Session, ackHandle uint32, stageID string) {
 
 	// Save our new stage ID and pointer to the new stage itself.
 	s.Lock()
-	s.stageID = stageID
 	s.stage = s.server.stages[stageID]
 	s.Unlock()
 
@@ -153,13 +152,13 @@ func handleMsgSysEnterStage(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysEnterStage)
 
 	// Push our current stage ID to the movement stack before entering another one.
-	if s.stageID == "" {
+	if s.stage.id == "" {
 		s.stageMoveStack.Set(pkt.StageID)
 	} else {
 		s.stage.Lock()
 		s.stage.reservedClientSlots[s.charID] = false
 		s.stage.Unlock()
-		s.stageMoveStack.Push(s.stageID)
+		s.stageMoveStack.Push(s.stage.id)
 		s.stageMoveStack.Lock()
 	}
 
@@ -206,9 +205,12 @@ func handleMsgSysLeaveStage(s *Session, p mhfpacket.MHFPacket) {}
 
 func handleMsgSysLockStage(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysLockStage)
-	// TODO(Andoryuuta): What does this packet _actually_ do?
-	// I think this is supposed to mark a stage as no longer able to accept client reservations
-	doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00})
+	if stage, exists := s.server.stages[pkt.StageID]; exists {
+		stage.Lock()
+		stage.locked = true
+		stage.Unlock()
+	}
+	doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
 }
 
 func handleMsgSysUnlockStage(s *Session, p mhfpacket.MHFPacket) {
@@ -218,7 +220,9 @@ func handleMsgSysUnlockStage(s *Session, p mhfpacket.MHFPacket) {
 
 		for charID := range s.reservationStage.reservedClientSlots {
 			session := s.server.FindSessionByCharID(charID)
-			session.QueueSendMHF(&mhfpacket.MsgSysStageDestruct{})
+			if session != nil {
+				session.QueueSendMHF(&mhfpacket.MsgSysStageDestruct{})
+			}
 		}
 
 		delete(s.server.stages, s.reservationStage.id)
@@ -241,6 +245,10 @@ func handleMsgSysReserveStage(s *Session, p mhfpacket.MHFPacket) {
 			}
 			doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
 		} else if uint16(len(stage.reservedClientSlots)) < stage.maxPlayers {
+			if stage.locked {
+				doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
+				return
+			}
 			if len(stage.password) > 0 {
 				if stage.password != s.stagePass {
 					doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
@@ -383,20 +391,17 @@ func handleMsgSysEnumerateStage(s *Session, p mhfpacket.MHFPacket) {
 		joinable++
 
 		bf.WriteUint16(uint16(len(stage.reservedClientSlots)))
-		bf.WriteUint16(0) // Unk
-		if len(stage.clients) > 0 {
-			bf.WriteUint16(1)
-		} else {
-			bf.WriteUint16(0)
-		}
+		bf.WriteUint16(uint16(len(stage.clients)))
+		bf.WriteUint16(uint16(len(stage.clients)))
 		bf.WriteUint16(stage.maxPlayers)
-		if len(stage.password) > 0 {
-			// This byte has also been seen as 1
-			// The quest is also recognised as locked when this is 2
-			bf.WriteUint8(2)
-		} else {
-			bf.WriteUint8(0)
+		var flags uint8
+		if stage.locked {
+			flags |= 1
 		}
+		if len(stage.password) > 0 {
+			flags |= 2
+		}
+		bf.WriteUint8(flags)
 		ps.Uint8(bf, sid, false)
 		stage.RUnlock()
 	}

server/channelserver/sys_session.go

@@ -36,7 +36,6 @@ type Session struct {
 
 	objectIndex      uint16
 	userEnteredStage bool // If the user has entered a stage before
-	stageID          string
 	stage            *Stage
 	reservationStage *Stage // Required for the stateful MsgSysUnreserveStage packet.
 	stagePass        string // Temporary storage