mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-15 18:29:46 +00:00
Code Issues Projects Releases Wiki Activity

Entity: added getEyePos()

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-08-02 17:29:32 +01:00
parent e03f918806
commit 1cd955c216
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/entity/Entity.php
View File

@ -1171,6 +1171,10 @@ abstract class Entity extends Location{
return $this->eyeHeight;
}
public function getEyePos() : Vector3{
return new Vector3($this->x, $this->y + $this->getEyeHeight(), $this->z);
}
public function onCollideWithPlayer(Player $player) : void{
}

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

@ -96,7 +96,7 @@ class SplashPotion extends Throwable{
if(!$this->willLinger()){
foreach($this->world->getNearbyEntities($this->boundingBox->expandedCopy(4.125, 2.125, 4.125), $this) as $entity){
if($entity instanceof Living and $entity->isAlive()){
$distanceSquared = $entity->add(0, $entity->getEyeHeight(), 0)->distanceSquared($this);
$distanceSquared = $entity->getEyePos()->distanceSquared($this);
if($distanceSquared > 16){ //4 blocks
continue;
}

2
src/item/Bow.php
View File

@ -51,7 +51,7 @@ class Bow extends Tool{
}
$nbt = EntityFactory::createBaseNBT(
$player->add(0, $player->getEyeHeight(), 0),
$player->getEyePos(),
$player->getDirectionVector(),
($player->yaw > 180 ? 360 : 0) - $player->yaw,
-$player->pitch

2
src/item/ProjectileItem.php
View File

@ -53,7 +53,7 @@ abstract class ProjectileItem extends Item{
}
public function onClickAir(Player $player, Vector3 $directionVector) : ItemUseResult{
$nbt = EntityFactory::createBaseNBT($player->add(0, $player->getEyeHeight(), 0), $directionVector, $player->yaw, $player->pitch);
$nbt = EntityFactory::createBaseNBT($player->getEyePos(), $directionVector, $player->yaw, $player->pitch);
$this->addExtraTags($nbt);
$class = $this->getProjectileEntityClass();

2
src/player/Player.php
View File

@ -1463,7 +1463,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* @return bool
*/
public function canInteract(Vector3 $pos, float $maxDistance, float $maxDiff = M_SQRT3 / 2) : bool{
$eyePos = $this->getPosition()->add(0, $this->getEyeHeight(), 0);
$eyePos = $this->getEyePos();
if($eyePos->distanceSquared($pos) > $maxDistance ** 2){
return false;
}