fix conflicts

This commit is contained in:
wish
2023-07-24 23:42:51 +10:00
parent 2a9504cd26
commit a3e1207dfd
2 changed files with 2 additions and 2 deletions

View File

@@ -97,7 +97,7 @@ func (s *Session) authenticate(username string, password string) {
switch resp {
case SIGN_SUCCESS:
if newCharaReq {
_ = s.server.newUserChara(username)
_ = s.server.newUserChara(uid)
}
bf.WriteBytes(s.makeSignResponse(uid))
default: