mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-19 17:36:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-10-05 01:17:59 +01:00
commit 0ad663ff50
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpstan.neon.dist
View File

@ -38,6 +38,9 @@ parameters:
- tests/phpunit - tests/phpunit
- tests/plugins/TesterPlugin - tests/plugins/TesterPlugin
- tools - tools
excludePaths:
analyseAndScan:
- build/php
dynamicConstantNames: dynamicConstantNames:
- pocketmine\VersionInfo::IS_DEVELOPMENT_BUILD - pocketmine\VersionInfo::IS_DEVELOPMENT_BUILD
- pocketmine\DEBUG - pocketmine\DEBUG

2
src/entity/projectile/Projectile.php
View File

@ -176,7 +176,7 @@ abstract class Projectile extends Entity{
Timings::$entityMove->startTiming(); Timings::$entityMove->startTiming();
$start = $this->location->asVector3(); $start = $this->location->asVector3();
$end = $start->addVector($this->motion); $end = $start->add($dx, $dy, $dz);
$blockHit = null; $blockHit = null;
$entityHit = null; $entityHit = null;