Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-13 23:44:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
server/signserver/dbutils.go
View File

@@ -12,7 +12,7 @@ import (
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
func (s *Server) newUserChara(uid int) error { func (s *Server) newUserChara(uid uint32) error {
var numNewChars int var numNewChars int
err := s.db.QueryRow("SELECT COUNT(*) FROM characters WHERE user_id = $1 AND is_new_character = true", uid).Scan(&numNewChars) err := s.db.QueryRow("SELECT COUNT(*) FROM characters WHERE user_id = $1 AND is_new_character = true", uid).Scan(&numNewChars)
if err != nil { if err != nil {

2
server/signserver/session.go
View File

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