From 039500ba87c6706ad84841b00bb7d5d8004f89e7 Mon Sep 17 00:00:00 2001
From: kercylan98 <kercylan@gmail.com>
Date: Wed, 11 Oct 2023 14:31:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20room.Manager.GetRoo?=
 =?UTF-8?q?m=20=E5=87=BD=E6=95=B0=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game/room/manager.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/game/room/manager.go b/game/room/manager.go
index 0f59582..57cd53e 100644
--- a/game/room/manager.go
+++ b/game/room/manager.go
@@ -208,8 +208,11 @@ func (slf *Manager[PID, P, R]) SetOwner(roomId int64, owner PID) {
 }
 
 // GetRoom 获取房间
-func (slf *Manager[PID, P, R]) GetRoom(guid int64) R {
-	return slf.rooms.Get(guid).room
+func (slf *Manager[PID, P, R]) GetRoom(guid int64) (r R) {
+	if room := slf.rooms.Get(guid); room != nil {
+		r = room.room
+	}
+	return r
 }
 
 // Exist 检查房间是否存在