Skip to content

Commit

Permalink
Version 0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
igor725 committed Dec 21, 2022
1 parent 89cd9d6 commit 6317f78
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
21 changes: 14 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ jobs:
os: windows
arch: x86_64
build: .\build.bat
testbin: .\core\out\x64dbg\server.exe
testbin: .\core\out\x64\server.exe

- name: Windows (x86)
os: windows
arch: x86
build: .\build.bat
testbin: .\core\out\x86dbg\server.exe
testbin: .\core\out\x86\server.exe

steps:
- name: Checkout Core repo
Expand Down Expand Up @@ -109,6 +109,12 @@ jobs:
repository: igor725/cs-worldedit
path: cs-worldedit

- name: Checkout Web plugin
uses: actions/checkout@v3
with:
repository: igor725/cs-web
path: cs-web

- name: Detect MSVC (Windows)
uses: ilammy/msvc-dev-cmd@v1
if: ${{matrix.config.os == 'windows'}}
Expand All @@ -127,18 +133,19 @@ jobs:
- name: Build core
working-directory: core
run: |
${{matrix.config.build}} wall dbg noprompt
${{matrix.config.build}} wall noprompt
- name: Build plugins
working-directory: core
env:
HOSTCC: ${{matrix.config.hostcc}}
MACOSX_DEPLOYMENT_TARGET: "11.0"
run: |
${{matrix.config.build}} wall dbg pb base install &&
${{matrix.config.build}} wall dbg pb survival install &&
${{matrix.config.build}} wall dbg pb worldedit install &&
${{matrix.config.build}} wall dbg pb lua install
${{matrix.config.build}} wall pb base install &&
${{matrix.config.build}} wall pb survival install &&
${{matrix.config.build}} wall pb worldedit install &&
${{matrix.config.build}} wall pb lua install &&
${{matrix.config.build}} wall pb web install wbuild
- name: Make some tests
if: ${{matrix.config.testbin != null}}
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ Notice that these arguments must be passed **after** the `pb` argument and plugi
## Notes
* Use this software carefully! The server **may** have many security holes.
* At this point, it is strongly recommended to recompile **all plugins** every time you update the server, otherwise your server may crash due to API incompatibility.
* My main OS is Windows 10, this means the Linux thing are not well tested.
* By default the server doesn't have any useful chat commands, build the [cs-base](https://github.com/igor725/cs-base) plugin for an expanded command set.
* Here is the [example plugin](https://github.com/igor725/cs-test) for this server software.
* Your directory should have the following structure in order to compile plugins:
Expand Down
2 changes: 1 addition & 1 deletion src/block.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "platform.h"
#include "list.h"

static cs_str defaultBlockNames[BLOCK_DEFAULT_COUNT] = {
static cs_str const defaultBlockNames[BLOCK_DEFAULT_COUNT] = {
"Air", "Stone", "Grass", "Dirt",
"Cobblestone", "Wood", "Sapling",
"Bedrock", "Water", "Still water",
Expand Down
6 changes: 2 additions & 4 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@ int main(int argc, char *argv[]) {
Log_Error("Some tests failed!");
Process_Exit(1);
}
} else {
if(Server_Init())
Server_StartLoop();
}
} else if(Server_Init())
Server_StartLoop();

Server_Cleanup();
Compr_Uninit();
Expand Down

0 comments on commit 6317f78

Please sign in to comment.