Skip to content

Commit

Permalink
Merge branch 'stable' into major-next
Browse files Browse the repository at this point in the history
  • Loading branch information
dktapps committed Dec 3, 2024
2 parents 08f8b08 + fde6654 commit 397db4e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @pmmp/server-developers
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,10 @@ updates:
interval: monthly
time: "10:00"
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
groups:
github-actions:
patterns: ["*"]
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
php: ['8.2', '8.3']
name: PHP ${{ matrix.php }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@2.29.0
uses: shivammathur/setup-php@2.31.1
with:
php-version: ${{ matrix.php }}

- name: Cache Composer packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "~/.cache/composer"
key: "php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}-v2"
Expand Down
6 changes: 3 additions & 3 deletions src/Vector3.php
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ public function distance(Vector3 $pos) : float{

public function distanceSquared(Vector3 $pos) : float{
$dx = $this->x - $pos->x;
$dy = $this->y - $pos->y;
$dz = $this->z - $pos->z;
return ($dx * $dx) + ($dy * $dy) + ($dz * $dz);
$dy = $this->y - $pos->y;
$dz = $this->z - $pos->z;
return ($dx * $dx) + ($dy * $dy) + ($dz * $dz);
}

public function maxPlainDistance(Vector3|Vector2|float $x, float $z = 0) : float{
Expand Down

0 comments on commit 397db4e

Please sign in to comment.