diff --git a/logic/controller/login.go b/logic/controller/login.go
index 653c99c27..2e71ad761 100644
--- a/logic/controller/login.go
+++ b/logic/controller/login.go
@@ -96,7 +96,7 @@ func (h *Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.
 	result = user.NewOutInfo() //设置登录消息
 
 	result.PlayerInfo = *t.Info
-	space.GetSpace(t.Info.MapID).EnterMap(t)
+	defer space.GetSpace(t.Info.MapID).EnterMap(t)
 
 	return result, 0
 
diff --git a/logic/service/player/save.go b/logic/service/player/save.go
index d46d75b7f..4b9172eb4 100644
--- a/logic/service/player/save.go
+++ b/logic/service/player/save.go
@@ -72,6 +72,13 @@ func (lw *Player) CompleteLogin() {
 	}
 	if lw.IsNewPlayer() { //重置新手地图，放到机械仓
 		lw.Info.MapID = 8
+		if len(lw.Info.PetList) == 0 {
+			rr := lw.Service.Pet.PetInfo(0)
+			if len(rr) > 0 {
+				lw.Info.PetList = append(lw.Info.PetList, rr[0].Data)
+			}
+
+		}
 	}
 	lw.IsLogin = true
 }