From 5747f2a40ea67ea83c03f9a071f2cbad4c1b3219 Mon Sep 17 00:00:00 2001 From: Dries C Date: Sat, 2 Mar 2024 13:52:53 +0100 Subject: [PATCH] [Build] remove arbitrary constraints --- .github/workflows/build.yml | 10 +++++----- .github/workflows/phpstan.yml | 8 ++++---- src/MyPlot/forms/subforms/AutoForm.php | 6 ------ src/MyPlot/forms/subforms/ClaimForm.php | 2 -- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68a239b8..2a23001c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,16 +19,16 @@ jobs: path: PharBuilder ref: pm5 - name: Download PHP Release - uses: dsaltares/fetch-gh-release-asset@1.0.0 + uses: dsaltares/fetch-gh-release-asset@1.1.1 with: - file: Linux.zip + file: PHP-Linux-x86_64-PM5.tar.gz repo: NetherGamesMC/php-build-scripts - version: "tags/8.2-pm5" + version: "tags/php-8.3-latest" token: ${{ secrets.GITHUB_TOKEN }} - name: Unpack PHP Release - run: unzip Linux.zip && tar -xzvf PHP_Linux-x86_64.tar.gz + run: tar -xzvf PHP-Linux-x86_64-PM5.tar.gz - name: Download pharbuilder-rs - uses: dsaltares/fetch-gh-release-asset@1.1.0 + uses: dsaltares/fetch-gh-release-asset@1.1.1 with: file: pharbuilder repo: NetherGamesMC/pharbuilder-rs diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index d932b803..d442d7e1 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -12,14 +12,14 @@ jobs: - name: Startup uses: actions/checkout@v3 - name: Download PHP Release - uses: dsaltares/fetch-gh-release-asset@1.0.0 + uses: dsaltares/fetch-gh-release-asset@1.1.1 with: - file: Linux.zip + file: PHP-Linux-x86_64-PM5.tar.gz repo: NetherGamesMC/php-build-scripts - version: "tags/8.2-pm5" + version: "tags/php-8.3-latest" token: ${{ secrets.GITHUB_TOKEN }} - name: Unpack PHP Release - run: unzip Linux.zip && tar -xzvf PHP_Linux-x86_64.tar.gz + run: tar -xzvf PHP-Linux-x86_64-PM5.tar.gz - name: Checkout PharBuilder uses: actions/checkout@v3 with: diff --git a/src/MyPlot/forms/subforms/AutoForm.php b/src/MyPlot/forms/subforms/AutoForm.php index a5a3983c..1038fc15 100644 --- a/src/MyPlot/forms/subforms/AutoForm.php +++ b/src/MyPlot/forms/subforms/AutoForm.php @@ -32,12 +32,6 @@ public function getName(): string public function onButtonClick(Player $player): void { $plugin = MyPlot::getInstance(); - - if ($player->getWorld()->getFolderName() === 'Platinum' && MyPlot::essentialsExists() && !$player->hasPermission(Permissions::RANK_ULTRA)) { - $player->sendMessage('§cThat action is blocked for you in this world.'); - return; - } - $player->getServer()->dispatchCommand($player, $plugin->getLanguage()->get("command.name") . " " . $plugin->getLanguage()->get("auto.name"), true); } } \ No newline at end of file diff --git a/src/MyPlot/forms/subforms/ClaimForm.php b/src/MyPlot/forms/subforms/ClaimForm.php index fbd3a5ee..55078a49 100644 --- a/src/MyPlot/forms/subforms/ClaimForm.php +++ b/src/MyPlot/forms/subforms/ClaimForm.php @@ -41,8 +41,6 @@ public function onButtonClick(Player $player): void } else { $player->sendMessage(TextFormat::RED . $plugin->getLanguage()->translateString('claim.alreadyclaimed', [$plot->owner])); } - } else if ($player->getWorld()->getFolderName() === 'Platinum' && MyPlot::essentialsExists() && !$player->hasPermission(Permissions::RANK_ULTRA)) { - $player->sendMessage('§cThat action is blocked for you in this world.'); } else { $maxPlots = $plugin->getMaxPlotsOfPlayer($player); $plotsOfPlayer = count($plugin->getProvider()->getPlotsByOwner($player->getName(), $player->getWorld()->getFolderName()));