Update go.yml

.github/workflows/go.yml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     
     steps:
     - uses: actions/checkout@v3
@@ -14,13 +14,28 @@ jobs:
       with:
         go-version: 1.18
 
-    - name: Build
+    - name: Build Linux-amd64
-      run: go build -v
+      run: env GOOS=linux GOARCH=amd64 go build -v
         
-    - name: Upload artifacts
+    - name: Upload Linux-amd64 artifacts
       uses: actions/upload-artifact@v3
       with:
-        name: Erupe
+        name: Linux-amd64
+        path: |
+          ./erupe-ce
+          ./config.json
+          ./www/
+          ./savedata/
+          ./bin/
+          ./RoadShopItems.csv
+
+    - name: Build Windows-amd64
+      run: env GOOS=windows GOARCH=amd64 go build -v
+      
+    - name: Upload Windows-amd64 artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: Windows-amd64
         path: |
           ./erupe-ce.exe
           ./config.json

common/stringsupport/string_convert.go

@@ -106,7 +106,7 @@ func PaddedString(x string, size uint, t bool) []byte {
 		e := japanese.ShiftJIS.NewEncoder()
 		xt, _, err := transform.String(e, x)
 		if err != nil {
-			panic(err)
+			return make([]byte, 0)
 		}
 		x = xt
 	}

server/channelserver/handlers.go

@@ -135,7 +135,7 @@ func handleMsgSysTerminalLog(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysLogin)
 
-	if s.server.erupeConfig.DevMode && !s.server.erupeConfig.DevModeOptions.DisableTokenCheck {
+	if !s.server.erupeConfig.DevModeOptions.DisableTokenCheck {
 		var token string
 		err := s.server.db.QueryRow("SELECT token FROM sign_sessions WHERE token=$1", pkt.LoginTokenString).Scan(&token)
 		if err != nil {

server/signserver/dbutils.go

@@ -87,7 +87,7 @@ type character struct {
 }
 
 func (s *Server) getCharactersForUser(uid int) ([]character, error) {
-	characters := []character{}
+	characters := make([]character, 0)
 	err := s.db.Select(&characters, "SELECT id, is_female, is_new_character, name, unk_desc_string, hrp, gr, weapon_type, last_login FROM characters WHERE user_id = $1 AND deleted = false", uid)
 	if err != nil {
 		return nil, err
@@ -126,7 +126,7 @@ func (s *Server) getFriendsForCharacters(chars []character) []members {
 				friendQuery += " OR id="
 			}
 		}
-		charFriends := []members{}
+		charFriends := make([]members, 0)
 		err = s.db.Select(&charFriends, friendQuery)
 		if err != nil {
 			continue
@@ -153,7 +153,7 @@ func (s *Server) getGuildmatesForCharacters(chars []character) []members {
 			if err != nil {
 				continue
 			}
-			charGuildmates := []members{}
+			charGuildmates := make([]members, 0)
 			err = s.db.Select(&charGuildmates, "SELECT character_id AS id, c.name FROM guild_characters gc JOIN characters c ON c.id = gc.character_id WHERE guild_id=$1 AND character_id!=$2", guildID, char.ID)
 			if err != nil {
 				continue