diff --git a/logic/controller/user_info.go b/logic/controller/user_info.go index d86c20577..80444d643 100644 --- a/logic/controller/user_info.go +++ b/logic/controller/user_info.go @@ -19,6 +19,10 @@ func (h Controller) GetUserSimInfo(data *user.SimUserInfoInboundInfo, player *pl if ok { copier.Copy(result, t) } else { + r := player.Service.Info.Person(data.UserId) + if r == nil { + return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrSystemError) + } copier.Copy(result, player.Service.Info.Person(data.UserId).Data) } diff --git a/modules/player/model/pet.go b/modules/player/model/pet.go index c2884fff0..61b7dc442 100644 --- a/modules/player/model/pet.go +++ b/modules/player/model/pet.go @@ -228,7 +228,9 @@ func (pet *PetInfo) FixShiny() { func (pet *PetInfo) RandomByWeightShiny() { co := service.NewShinyService().RandomByWeightShiny(pet.ID) - pet.ShinyInfo = append(pet.ShinyInfo, *co) + if co != nil { + pet.ShinyInfo = append(pet.ShinyInfo, *co) + } } func (pet *PetInfo) IsShiny() bool {