Merge commit '839a789180cb3acd2e16006afa9b787903ffbbcd'

This commit is contained in:
Dylan K. Taylor 2020-01-31 19:16:09 +00:00
commit eb6bb1aae1
2 changed files with 8 additions and 0 deletions

View File

@ -1687,6 +1687,9 @@ abstract class Entity{
$this->networkProperties->setGenericFlag(EntityMetadataFlags::WALLCLIMBING, $this->canClimbWalls);
}
/**
* @param Player[]|null $players
*/
public function broadcastEntityEvent(int $eventId, ?int $eventData = null, ?array $players = null) : void{
$this->server->broadcastPackets($players ?? $this->getViewers(), [ActorEventPacket::create($this->id, $eventId, $eventData ?? 0)]);
}

View File

@ -631,6 +631,8 @@ abstract class Living extends Entity{
}
/**
* @param true[] $transparent
*
* @return Block[]
*/
public function getLineOfSight(int $maxDistance, int $maxLength = 0, array $transparent = []) : array{
@ -670,6 +672,9 @@ abstract class Living extends Entity{
return $blocks;
}
/**
* @param true[] $transparent
*/
public function getTargetBlock(int $maxDistance, array $transparent = []) : ?Block{
$line = $this->getLineOfSight($maxDistance, 1, $transparent);
if(count($line) > 0){