diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index ea8137f89e6..6e035e735a1 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -53,7 +53,7 @@ jobs: run: echo NAME=$(echo "${GITHUB_REPOSITORY,,}") >> $GITHUB_OUTPUT - name: Build image for tag - uses: docker/build-push-action@v5.2.0 + uses: docker/build-push-action@v5.3.0 with: push: true context: ./pocketmine-mp @@ -66,7 +66,7 @@ jobs: - name: Build image for major tag if: steps.channel.outputs.CHANNEL == 'stable' - uses: docker/build-push-action@v5.2.0 + uses: docker/build-push-action@v5.3.0 with: push: true context: ./pocketmine-mp @@ -79,7 +79,7 @@ jobs: - name: Build image for minor tag if: steps.channel.outputs.CHANNEL == 'stable' - uses: docker/build-push-action@v5.2.0 + uses: docker/build-push-action@v5.3.0 with: push: true context: ./pocketmine-mp @@ -92,7 +92,7 @@ jobs: - name: Build image for latest tag if: steps.channel.outputs.CHANNEL == 'stable' - uses: docker/build-push-action@v5.2.0 + uses: docker/build-push-action@v5.3.0 with: push: true context: ./pocketmine-mp diff --git a/composer.json b/composer.json index 962777275ee..e79ef4859ed 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "symfony/filesystem": "~6.4.0" }, "require-dev": { - "phpstan/phpstan": "1.10.60", + "phpstan/phpstan": "1.10.62", "phpstan/phpstan-phpunit": "^1.1.0", "phpstan/phpstan-strict-rules": "^1.2.0", "phpunit/phpunit": "~10.3.0 || ~10.2.0 || ~10.1.0" diff --git a/composer.lock b/composer.lock index 0b04e40df1c..230c1d18638 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e861861cb1f632e1db21efc6875a0aba", + "content-hash": "549a32065a300a7dfe74df2407b81126", "packages": [ { "name": "adhocore/json-comment", @@ -1380,16 +1380,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.60", + "version": "1.10.62", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "95dcea7d6c628a3f2f56d091d8a0219485a86bbe" + "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/95dcea7d6c628a3f2f56d091d8a0219485a86bbe", - "reference": "95dcea7d6c628a3f2f56d091d8a0219485a86bbe", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", + "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", "shasum": "" }, "require": { @@ -1438,7 +1438,7 @@ "type": "tidelift" } ], - "time": "2024-03-07T13:30:19+00:00" + "time": "2024-03-13T12:27:20+00:00" }, { "name": "phpstan/phpstan-phpunit", diff --git a/resources/pocketmine.yml b/resources/pocketmine.yml index 408b5b95b3d..4c890c8d86f 100644 --- a/resources/pocketmine.yml +++ b/resources/pocketmine.yml @@ -4,6 +4,7 @@ # New settings/defaults won't appear automatically in this file when upgrading. settings: + dylan-thank-you: true #Whether to send all strings translated to server locale or let the device handle them force-language: false shutdown-message: "Server closed" diff --git a/src/YmlServerProperties.php b/src/YmlServerProperties.php index 9bd203eef85..a63ebc79d30 100644 --- a/src/YmlServerProperties.php +++ b/src/YmlServerProperties.php @@ -104,6 +104,7 @@ private function __construct(){ public const PLUGINS_LEGACY_DATA_DIR = 'plugins.legacy-data-dir'; public const SETTINGS = 'settings'; public const SETTINGS_ASYNC_WORKERS = 'settings.async-workers'; + public const SETTINGS_DYLAN_THANK_YOU = 'settings.dylan-thank-you'; public const SETTINGS_ENABLE_DEV_BUILDS = 'settings.enable-dev-builds'; public const SETTINGS_ENABLE_PROFILING = 'settings.enable-profiling'; public const SETTINGS_FORCE_LANGUAGE = 'settings.force-language'; diff --git a/src/network/mcpe/raklib/RakLibInterface.php b/src/network/mcpe/raklib/RakLibInterface.php index b2325f5698f..732d283a1ff 100644 --- a/src/network/mcpe/raklib/RakLibInterface.php +++ b/src/network/mcpe/raklib/RakLibInterface.php @@ -267,7 +267,7 @@ public function setName(string $name) : void{ $info->getPlayerCount(), $info->getMaxPlayerCount(), $this->rakServerId, - $this->server->getName(), + $this->server->getConfigGroup()->getPropertyBool(YmlServerProperties::SETTINGS_DYLAN_THANK_YOU, true) ? "Dylan, thank you! <3" : $this->server->getName(), match($this->server->getGamemode()){ GameMode::SURVIVAL => "Survival", GameMode::ADVENTURE => "Adventure",