Skip to content

Commit 48089a3

Browse files
committed
Updated Codacy static analysis to latest version on GitHub Actions
[sphereCrypt.ini]: Added crypt key for classic client 7.0.98 and enhanced client 4.0.98
1 parent 6cce9d9 commit 48089a3

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

.github/workflows/codacy-analysis.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ name: Codacy Security Scan
1515

1616
on:
1717
push:
18-
branches: [ master ]
18+
branches: [ "master" ]
1919
pull_request:
2020
# The branches below must be a subset of the branches above
21-
branches: [ master ]
21+
branches: [ "master" ]
2222

2323
permissions:
2424
contents: read
@@ -28,12 +28,13 @@ jobs:
2828
permissions:
2929
contents: read # for actions/checkout to fetch code
3030
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
31+
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
3132
name: Codacy Security Scan
3233
runs-on: ubuntu-latest
3334
steps:
3435
# Checkout the repository to the GitHub Actions runner
3536
- name: Checkout code
36-
uses: actions/checkout@v2
37+
uses: actions/checkout@v3
3738

3839
# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
3940
- name: Run Codacy Analysis CLI
@@ -53,6 +54,6 @@ jobs:
5354

5455
# Upload the SARIF file generated in the previous step
5556
- name: Upload SARIF results file
56-
uses: github/codeql-action/upload-sarif@v1
57+
uses: github/codeql-action/upload-sarif@v2
5758
with:
5859
sarif_file: results.sarif

changelog.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1862,4 +1862,7 @@ Fixed: Server crash when call intrinsic functions <eval ISNUMBER()> / <floatval
18621862
[sphereCrypt.ini]: Added crypt key for classic client 7.0.97 and enhanced client 4.0.97
18631863

18641864
21-10-2022, Coruja
1865-
Changed: Updated internal Zlib libs v1.2.11 to v1.2.13.
1865+
Changed: Updated internal Zlib libs v1.2.11 to v1.2.13.
1866+
1867+
28-01-2023, Coruja
1868+
[sphereCrypt.ini]: Added crypt key for classic client 7.0.98 and enhanced client 4.0.98

src/graysvr/CClient.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ enum BUFF_ICONS
296296
BI_POTIONOFGLORIOUSFORTUNE,
297297
BI_MYSTICALPOLYMORPHTOTEM,
298298
BI_DISCORDANCEDEBUFF,
299-
BI_CHALICEOFPILFERINGPROTECTION
299+
BI_CHALICEOFPILFERINGPROTECTION,
300+
BI_BATTLELUST
300301
};
301302

302303
struct CSectorEnviron // When these change it is an CTRIG_EnvironChange

src/graysvr/SphereSvr.rc

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ BEGIN
4343
VALUE "FileDescription", "SphereServer " SPHERE_VER_STR
4444
VALUE "FileVersion", SPHERE_VER_STR_FULL
4545
VALUE "InternalName", "SphereSvr"
46-
VALUE "LegalCopyright", "Copyright 1997-2022 by SphereServer development team"
46+
VALUE "LegalCopyright", "Copyright 1997-2023 by SphereServer development team"
4747
VALUE "OriginalFilename", "SphereSvr.exe"
4848
VALUE "ProductName", "SphereServer"
4949
VALUE "ProductVersion", SPHERE_VER_STR_FULL
@@ -115,7 +115,7 @@ BEGIN
115115
LTEXT "Version", IDC_ABOUT_VERSION, 10, 8, 200, 8
116116
CTEXT "Website", IDC_ABOUT_WEBSITE, 220, 8, 90, 8
117117
LTEXT "Compiler", IDC_ABOUT_COMPILER, 10, 16, 200, 8
118-
LTEXT "Copyright (C) 1997-2022 SphereServer development team", 3, 10, 24, 200, 8
118+
LTEXT "Copyright (C) 1997-2023 SphereServer development team", 3, 10, 24, 200, 8
119119
CTEXT "___________________________________________________________________________", 4, 0, 32, 320, 8
120120
LTEXT "This software makes use of:", 5, 10, 46, 100, 8
121121
LTEXT "libev library (v4.33)\nCopyright (C) 2007-2020 Marc Alexander Lehmann", 6, 15, 62, 290, 16

src/sphereCrypt.ini

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//****************************************************************************
2-
// Copyright 2022 SphereServer development team
2+
// Copyright 2023 SphereServer development team
33
// Licensed under the Apache License, Version 2.0 (the "License").
44
// You may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
66
//****************************************************************************
7-
// FILE LAST UPDATED: Friday, Sept 30, 2022
7+
// FILE LAST UPDATED: Saturday, Jan 28, 2023
88

99
// WARNING: Modifing this file, without knowing what you are doing, can make Sphere behave incorrectly.
1010

@@ -22,6 +22,7 @@ ENC_TFISH 3 // Twofish
2222

2323
[SPHERECRYPT]
2424
//Classic Clients
25+
7009800 03AA8ABDD 0A9AB227F ENC_TFISH // 7.0.98
2526
7009700 03AE221ED 0A9F47E7F ENC_TFISH // 7.0.97
2627
7009600 03ADBA3FD 0A9E1527F ENC_TFISH // 7.0.96
2728
7009500 03B1D220D 0A915BE7F ENC_TFISH // 7.0.95
@@ -179,6 +180,7 @@ ENC_TFISH 3 // Twofish
179180
2000000 02D13A5FD 0A39D527F ENC_BFISH // 2.0.0
180181

181182
//Enhanced Clients
183+
067900980 018A8ABDD 0B8AB227F ENC_TFISH // 4.0.98
182184
067900970 018E221ED 0B8F47E7F ENC_TFISH // 4.0.97
183185
067900960 018DBA3FD 0B8E1527F ENC_TFISH // 4.0.96
184186
067900950 0191D220D 0B815BE7F ENC_TFISH // 4.0.95

0 commit comments

Comments
 (0)