diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml deleted file mode 100644 index d4613eb3..00000000 --- a/.github/workflows/clang-format.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Check formatting - -on: - pull_request: - paths: - - '**' - - '!.gitignore' - - '!*.md' - - '!.github/**' - - '.github/workflows/clang-format.yml' - -permissions: - contents: read - pull-requests: write - -jobs: - format-check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - with: - ref: ${{ github.event.pull_request.head.sha }} - fetch-depth: 0 - - - name: Fetch base commit - run: git fetch origin ${{ github.event.pull_request.base.sha }} - - - name: Install clang-format-20 - run: | - wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc - sudo add-apt-repository -y "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main" - sudo apt-get install -y -qq clang-format-20 - - - uses: reviewdog/action-setup@v1 - - - name: Check formatting on changed lines - env: - REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - git clang-format-20 --binary clang-format-20 \ - --diff ${{ github.event.pull_request.base.sha }} -- \ - '*.c' '*.cpp' '*.cc' '*.h' '*.hpp' \ - | reviewdog \ - -name="clang-format" \ - -f=diff \ - -reporter=github-pr-check \ - -fail-level=error \ - -filter-mode=added \ No newline at end of file diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1e374b05..3a2f9f37 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -5,12 +5,11 @@ on: push: branches: - 'Renewed-TU25-Dev' - paths: - - '**' - - '!.gitignore' - - '!*.md' - - '!.github/**' - - '.github/workflows/nightly.yml' + paths-ignore: + - '.gitignore' + - '*.md' + - '.github/**' + - '!.github/workflows/nightly.yml' permissions: contents: write diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index f1f11e66..7e8ef3c5 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -4,12 +4,10 @@ on: workflow_dispatch: pull_request: types: [opened, reopened, synchronize] - paths: - - '**' - - '!.gitignore' - - '!*.md' - - '!.github/**' - - '.github/workflows/pull-request.yml' + paths-ignore: + - '.gitignore' + - '*.md' + - '.github/*.md' jobs: build: diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp index d8bb9ce5..abbbd7c1 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -1792,7 +1792,7 @@ void MinecraftServer::run(int64_t seed, void *lpParameter) chunkPacketManagement_PostTick(); } - lastTime = getCurrentTimeMillis(); // Is this a good fix? + //lastTime = getCurrentTimeMillis(); // Is this a good fix? //int64_t afterall = System::currentTimeMillis(); //PIXReportCounter(L"Server time all",(float)(afterall-beforeall)); //PIXReportCounter(L"Server ticks",(float)tickcount); diff --git a/Minecraft.Client/ServerLevel.cpp b/Minecraft.Client/ServerLevel.cpp index 5c0aa7f6..b69628d4 100644 --- a/Minecraft.Client/ServerLevel.cpp +++ b/Minecraft.Client/ServerLevel.cpp @@ -678,7 +678,8 @@ bool ServerLevel::tickPendingTicks(bool force) } else { - forceAddTileTick(td.x, td.y, td.z, td.tileId, 0, td.priorityTilt); // Is this a good fix? + addToTickNextTick(td.x, td.y, td.z, td.tileId, 0); + //forceAddTileTick(td.x, td.y, td.z, td.tileId, 0, td.priorityTilt); // Is this a good fix? } } diff --git a/docker-compose.dedicated-server.ghcr.yml b/docker-compose.dedicated-server.ghcr.yml index bb7a88d3..aff044b7 100644 --- a/docker-compose.dedicated-server.ghcr.yml +++ b/docker-compose.dedicated-server.ghcr.yml @@ -22,8 +22,8 @@ services: # - wineprefix64:/var/opt/wineprefix64 - ./server-data:/srv/persist ports: - - "25565:25565/tcp" - - "25565:25565/udp" + - "$SERVER_PORT:$SERVER_PORT/tcp" + - "$SERVER_PORT:$SERVER_PORT/udp" stop_grace_period: 30s # volumes: diff --git a/docker-compose.dedicated-server.yml b/docker-compose.dedicated-server.yml index 5b0fc69c..4b39e279 100644 --- a/docker-compose.dedicated-server.yml +++ b/docker-compose.dedicated-server.yml @@ -26,8 +26,8 @@ services: # - wineprefix64:/var/opt/wineprefix64 - ./server-data:/srv/persist ports: - - "25565:25565/tcp" - - "25565:25565/udp" + - "$SERVER_PORT:$SERVER_PORT/tcp" + - "$SERVER_PORT:$SERVER_PORT/udp" stop_grace_period: 30s # volumes: