diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2aca2934e..913a575f3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,10 +17,11 @@ jobs: steps: - name: Build and prepare PHP cache - uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 + uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: "4" phpstan: name: PHPStan analysis @@ -37,10 +38,11 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP - uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 + uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: "4" - name: Install Composer run: curl -sS https://getcomposer.org/installer | php @@ -75,10 +77,11 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP - uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 + uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: "4" - name: Install Composer run: curl -sS https://getcomposer.org/installer | php @@ -115,10 +118,11 @@ jobs: submodules: true - name: Setup PHP - uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 + uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: "4" - name: Install Composer run: curl -sS https://getcomposer.org/installer | php @@ -153,10 +157,11 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP - uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339 + uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: "4" - name: Install Composer run: curl -sS https://getcomposer.org/installer | php diff --git a/build/php b/build/php index 6b605ed7c..b479ec438 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit 6b605ed7c458fc8f95080ffe41a7f248a7160107 +Subproject commit b479ec438f05459eac959f4952152527bbc7ce0b diff --git a/src/PocketMine.php b/src/PocketMine.php index f49115826..4b0b644ec 100644 --- a/src/PocketMine.php +++ b/src/PocketMine.php @@ -122,7 +122,7 @@ namespace pocketmine { if(substr_count($pthreads_version, ".") < 2){ $pthreads_version = "0.$pthreads_version"; } - if(version_compare($pthreads_version, "4.0.0") < 0 || version_compare($pthreads_version, "5.0.0") > 0){ + if(version_compare($pthreads_version, "4.0.0") < 0 || version_compare($pthreads_version, "5.0.0") >= 0){ $messages[] = "pthreads ^4.0.0 is required, while you have $pthreads_version."; } }