Changed face position floating-point params to Vector3s

This commit is contained in:
Dylan K. Taylor 2017-08-20 10:23:34 +01:00
parent 5b3bed8b06
commit e1d894057c
50 changed files with 96 additions and 75 deletions

View File

@ -2364,6 +2364,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
$blockVector = new Vector3($packet->x, $packet->y, $packet->z); $blockVector = new Vector3($packet->x, $packet->y, $packet->z);
$facePos = new Vector3($packet->fx, $packet->fy, $packet->fz);
$this->craftingType = 0; $this->craftingType = 0;
@ -2373,7 +2374,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
if(!$this->canInteract($blockVector->add(0.5, 0.5, 0.5), 13) or $this->isSpectator()){ if(!$this->canInteract($blockVector->add(0.5, 0.5, 0.5), 13) or $this->isSpectator()){
}elseif($this->isCreative()){ }elseif($this->isCreative()){
$item = $this->inventory->getItemInHand(); $item = $this->inventory->getItemInHand();
if($this->level->useItemOn($blockVector, $item, $packet->face, $packet->fx, $packet->fy, $packet->fz, $this, true) === true){ if($this->level->useItemOn($blockVector, $item, $packet->face, $facePos, $this, true) === true){
return true; return true;
} }
}elseif(!$this->inventory->getItemInHand()->equals($packet->item)){ }elseif(!$this->inventory->getItemInHand()->equals($packet->item)){
@ -2381,7 +2382,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
}else{ }else{
$item = $this->inventory->getItemInHand(); $item = $this->inventory->getItemInHand();
$oldItem = clone $item; $oldItem = clone $item;
if($this->level->useItemOn($blockVector, $item, $packet->face, $packet->fx, $packet->fy, $packet->fz, $this, true)){ if($this->level->useItemOn($blockVector, $item, $packet->face, $facePos, $this, true)){
if(!$item->equals($oldItem) or $item->getCount() !== $oldItem->getCount()){ if(!$item->equals($oldItem) or $item->getCount() !== $oldItem->getCount()){
$this->inventory->setItemInHand($item); $this->inventory->setItemInHand($item);
$this->inventory->sendHeldItem($this->hasSpawned); $this->inventory->sendHeldItem($this->hasSpawned);

View File

@ -26,6 +26,7 @@ namespace pocketmine\block;
use pocketmine\inventory\AnvilInventory; use pocketmine\inventory\AnvilInventory;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class Anvil extends Fallable{ class Anvil extends Fallable{
@ -73,7 +74,7 @@ class Anvil extends Fallable{
return true; return true;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$direction = ($player !== null ? $player->getDirection() : 0) & 0x03; $direction = ($player !== null ? $player->getDirection() : 0) & 0x03;
$this->meta = ($this->meta & 0x0c) | $direction; $this->meta = ($this->meta & 0x0c) | $direction;
return $this->getLevel()->setBlock($block, $this, true, true); return $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -174,7 +174,7 @@ class Bed extends Transparent{
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if(!$down->isTransparent()){ if(!$down->isTransparent()){
$meta = (($player instanceof Player ? $player->getDirection() : 0) - 1) & 0x03; $meta = (($player instanceof Player ? $player->getDirection() : 0) - 1) & 0x03;

View File

@ -476,14 +476,12 @@ class Block extends Position implements BlockIds, Metadatable{
* @param Block $block * @param Block $block
* @param Block $target * @param Block $target
* @param int $face * @param int $face
* @param float $fx * @param Vector3 $facePos
* @param float $fy
* @param float $fz
* @param Player|null $player * @param Player|null $player
* *
* @return bool * @return bool
*/ */
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
return $this->getLevel()->setBlock($this, $this, true, true); return $this->getLevel()->setBlock($this, $this, true, true);
} }

View File

@ -56,7 +56,7 @@ class BrownMushroom extends Flowable{
return false; return false;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->isTransparent() === false){ if($down->isTransparent() === false){
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\nbt\NBT; use pocketmine\nbt\NBT;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\IntTag;
@ -58,7 +59,7 @@ class BurningFurnace extends Solid{
return 13; return 13;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$faces = [ $faces = [
0 => 4, 0 => 4,
1 => 2, 1 => 2,

View File

@ -108,7 +108,7 @@ class Cactus extends Transparent{
return false; return false;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->getId() === self::SAND or $down->getId() === self::CACTUS){ if($down->getId() === self::SAND or $down->getId() === self::CACTUS){
$block0 = $this->getSide(Vector3::SIDE_NORTH); $block0 = $this->getSide(Vector3::SIDE_NORTH);

View File

@ -62,7 +62,7 @@ class Cake extends Transparent implements FoodSource{
); );
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->getId() !== self::AIR){ if($down->getId() !== self::AIR){
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -62,7 +62,7 @@ class Carpet extends Flowable{
); );
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->getId() !== self::AIR){ if($down->getId() !== self::AIR){
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -67,7 +67,7 @@ class Chest extends Transparent{
); );
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$faces = [ $faces = [
0 => 4, 0 => 4,
1 => 2, 1 => 2,

View File

@ -32,7 +32,7 @@ use pocketmine\Server;
abstract class Crops extends Flowable{ abstract class Crops extends Flowable{
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($block->getSide(Vector3::SIDE_DOWN)->getId() === Block::FARMLAND){ if($block->getSide(Vector3::SIDE_DOWN)->getId() === Block::FARMLAND){
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -41,7 +41,7 @@ class Dandelion extends Flowable{
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->getId() === 2 or $down->getId() === 3 or $down->getId() === 60){ if($down->getId() === 2 or $down->getId() === 3 or $down->getId() === 60){
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -216,7 +216,7 @@ abstract class Door extends Transparent{
return false; return false;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($face === 1){ if($face === 1){
$blockUp = $this->getSide(Vector3::SIDE_UP); $blockUp = $this->getSide(Vector3::SIDE_UP);
$blockDown = $this->getSide(Vector3::SIDE_DOWN); $blockDown = $this->getSide(Vector3::SIDE_DOWN);

View File

@ -53,7 +53,7 @@ class DoublePlant extends Flowable{
return $names[$this->meta & 0x07] ?? ""; return $names[$this->meta & 0x07] ?? "";
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$id = $block->getSide(Vector3::SIDE_DOWN)->getId(); $id = $block->getSide(Vector3::SIDE_DOWN)->getId();
if(($id === Block::GRASS or $id === Block::DIRT) and $block->getSide(Vector3::SIDE_UP)->canBeReplaced()){ if(($id === Block::GRASS or $id === Block::DIRT) and $block->getSide(Vector3::SIDE_UP)->canBeReplaced()){
$this->getLevel()->setBlock($block, $this, false, false); $this->getLevel()->setBlock($block, $this, false, false);

View File

@ -26,6 +26,7 @@ namespace pocketmine\block;
use pocketmine\inventory\EnchantInventory; use pocketmine\inventory\EnchantInventory;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\IntTag;
use pocketmine\nbt\tag\StringTag; use pocketmine\nbt\tag\StringTag;
@ -40,7 +41,7 @@ class EnchantingTable extends Transparent{
$this->meta = $meta; $this->meta = $meta;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);
$nbt = new CompoundTag("", [ $nbt = new CompoundTag("", [
new StringTag("id", Tile::ENCHANT_TABLE), new StringTag("id", Tile::ENCHANT_TABLE),

View File

@ -40,7 +40,7 @@ class EndRod extends Flowable{
return "End Rod"; return "End Rod";
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($face === Vector3::SIDE_UP or $face === Vector3::SIDE_DOWN){ if($face === Vector3::SIDE_UP or $face === Vector3::SIDE_DOWN){
$this->meta = $face; $this->meta = $face;
}else{ }else{

View File

@ -27,6 +27,7 @@ use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\level\sound\DoorSound; use pocketmine\level\sound\DoorSound;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class FenceGate extends Transparent{ class FenceGate extends Transparent{
@ -68,7 +69,7 @@ class FenceGate extends Transparent{
} }
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$this->meta = ($player instanceof Player ? ($player->getDirection() - 1) & 0x03 : 0); $this->meta = ($player instanceof Player ? ($player->getDirection() - 1) & 0x03 : 0);
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -60,7 +60,7 @@ class Flower extends Flowable{
return $names[$this->meta] ?? "Unknown"; return $names[$this->meta] ?? "Unknown";
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){ if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){
$this->getLevel()->setBlock($block, $this, true); $this->getLevel()->setBlock($block, $this, true);

View File

@ -62,7 +62,7 @@ class FlowerPot extends Flowable{
); );
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){ if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
return false; return false;
} }

View File

@ -26,6 +26,7 @@ namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class GlazedTerracotta extends Solid{ class GlazedTerracotta extends Solid{
@ -38,7 +39,7 @@ class GlazedTerracotta extends Solid{
return Tool::TYPE_PICKAXE; return Tool::TYPE_PICKAXE;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($player !== null){ if($player !== null){
$faces = [ $faces = [
0 => 4, 0 => 4,

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class HayBale extends Solid{ class HayBale extends Solid{
@ -42,7 +43,7 @@ class HayBale extends Solid{
return 0.5; return 0.5;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$faces = [ $faces = [
0 => 0, 0 => 0,
1 => 0, 1 => 0,

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\{ use pocketmine\nbt\tag\{
ByteTag, CompoundTag, FloatTag, IntTag, StringTag ByteTag, CompoundTag, FloatTag, IntTag, StringTag
}; };
@ -103,7 +104,7 @@ class ItemFrame extends Flowable{
return false; return false;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($face === 0 or $face === 1){ if($face === 0 or $face === 1){
return false; return false;
} }

View File

@ -28,6 +28,7 @@ use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class Ladder extends Transparent{ class Ladder extends Transparent{
@ -109,7 +110,7 @@ class Ladder extends Transparent{
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($target->isTransparent() === false){ if($target->isTransparent() === false){
$faces = [ $faces = [
2 => 2, 2 => 2,

View File

@ -28,6 +28,7 @@ use pocketmine\event\entity\EntityCombustByBlockEvent;
use pocketmine\event\entity\EntityDamageByBlockEvent; use pocketmine\event\entity\EntityDamageByBlockEvent;
use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\Server; use pocketmine\Server;
@ -62,7 +63,7 @@ class Lava extends Liquid{
$entity->resetFallDistance(); $entity->resetFallDistance();
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$ret = $this->getLevel()->setBlock($this, $this, true, false); $ret = $this->getLevel()->setBlock($this, $this, true, false);
$this->getLevel()->scheduleDelayedBlockUpdate($this, $this->tickRate()); $this->getLevel()->scheduleDelayedBlockUpdate($this, $this->tickRate());

View File

@ -159,7 +159,7 @@ class Leaves extends Transparent{
return false; return false;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$this->meta |= 0x04; $this->meta |= 0x04;
return $this->getLevel()->setBlock($this, $this, true); return $this->getLevel()->setBlock($this, $this, true);
} }

View File

@ -39,7 +39,7 @@ class NetherWartPlant extends Flowable{
$this->meta = $meta; $this->meta = $meta;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->getId() === Block::SOUL_SAND){ if($down->getId() === Block::SOUL_SAND){
$this->getLevel()->setBlock($block, $this, false, true); $this->getLevel()->setBlock($block, $this, false, true);

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class Pumpkin extends Solid{ class Pumpkin extends Solid{
@ -47,7 +48,7 @@ class Pumpkin extends Solid{
return "Pumpkin"; return "Pumpkin";
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($player instanceof Player){ if($player instanceof Player){
$this->meta = ((int) $player->getDirection() + 1) % 4; $this->meta = ((int) $player->getDirection() + 1) % 4;
} }

View File

@ -55,7 +55,7 @@ class Rail extends Flowable{
return 0.7; return 0.7;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if(!$block->getSide(Vector3::SIDE_DOWN)->isTransparent()){ if(!$block->getSide(Vector3::SIDE_DOWN)->isTransparent()){
return $this->getLevel()->setBlock($block, $this, true, true); return $this->getLevel()->setBlock($block, $this, true, true);
} }

View File

@ -53,7 +53,7 @@ class RedMushroom extends Flowable{
return false; return false;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->isTransparent() === false){ if($down->isTransparent() === false){
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -26,6 +26,7 @@ namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class RedstoneOre extends Solid{ class RedstoneOre extends Solid{
@ -44,7 +45,7 @@ class RedstoneOre extends Solid{
return 3; return 3;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
return $this->getLevel()->setBlock($this, $this, true, false); return $this->getLevel()->setBlock($this, $this, true, false);
} }

View File

@ -57,7 +57,7 @@ class Sapling extends Flowable{
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->getId() === self::GRASS or $down->getId() === self::DIRT or $down->getId() === self::FARMLAND){ if($down->getId() === self::GRASS or $down->getId() === self::DIRT or $down->getId() === self::FARMLAND){
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -60,7 +60,7 @@ class SignPost extends Transparent{
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($face !== 0){ if($face !== 0){
$nbt = new CompoundTag("", [ $nbt = new CompoundTag("", [
new StringTag("id", Tile::SIGN), new StringTag("id", Tile::SIGN),

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\IntTag;
@ -62,7 +63,7 @@ class Skull extends Flowable{
); );
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($face !== 0){ if($face !== 0){
$this->meta = $face; $this->meta = $face;
if($face === 1){ if($face === 1){

View File

@ -54,7 +54,7 @@ class SnowLayer extends Flowable{
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($block->getSide(Vector3::SIDE_DOWN)->isSolid()){ if($block->getSide(Vector3::SIDE_DOWN)->isSolid()){
//TODO: fix placement //TODO: fix placement
$this->getLevel()->setBlock($block, $this, true); $this->getLevel()->setBlock($block, $this, true);

View File

@ -26,6 +26,7 @@ namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
abstract class Stair extends Transparent{ abstract class Stair extends Transparent{
@ -129,7 +130,7 @@ abstract class Stair extends Transparent{
} }
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$faces = [ $faces = [
0 => 0, 0 => 0,
1 => 2, 1 => 2,
@ -137,7 +138,7 @@ abstract class Stair extends Transparent{
3 => 3, 3 => 3,
]; ];
$this->meta = $faces[$player->getDirection()] & 0x03; $this->meta = $faces[$player->getDirection()] & 0x03;
if(($fy > 0.5 and $face !== 1) or $face === 0){ if(($facePos->y > 0.5 and $face !== 1) or $face === 0){
$this->meta |= 0x04; //Upside-down stairs $this->meta |= 0x04; //Upside-down stairs
} }
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -102,7 +102,7 @@ class Sugarcane extends Flowable{
return false; return false;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->getId() === self::SUGARCANE_BLOCK){ if($down->getId() === self::SUGARCANE_BLOCK){
$this->getLevel()->setBlock($block, Block::get(Block::SUGARCANE_BLOCK), true); $this->getLevel()->setBlock($block, Block::get(Block::SUGARCANE_BLOCK), true);

View File

@ -49,7 +49,7 @@ class TallGrass extends Flowable{
return $names[$this->meta & 0x03] ?? "Unknown"; return $names[$this->meta & 0x03] ?? "Unknown";
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$down = $this->getSide(Vector3::SIDE_DOWN); $down = $this->getSide(Vector3::SIDE_DOWN);
if($down->getId() === self::GRASS){ if($down->getId() === self::GRASS){
$this->getLevel()->setBlock($block, $this, true); $this->getLevel()->setBlock($block, $this, true);

View File

@ -68,7 +68,7 @@ class Torch extends Flowable{
return false; return false;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$below = $this->getSide(Vector3::SIDE_DOWN); $below = $this->getSide(Vector3::SIDE_DOWN);
if($target->isTransparent() === false and $face !== 0){ if($target->isTransparent() === false and $face !== 0){

View File

@ -27,6 +27,7 @@ use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\level\sound\DoorSound; use pocketmine\level\sound\DoorSound;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class Trapdoor extends Transparent{ class Trapdoor extends Transparent{
@ -123,7 +124,7 @@ class Trapdoor extends Transparent{
return $bb; return $bb;
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$directions = [ $directions = [
0 => 1, 0 => 1,
1 => 3, 1 => 3,
@ -133,7 +134,7 @@ class Trapdoor extends Transparent{
if($player !== null){ if($player !== null){
$this->meta = $directions[$player->getDirection() & 0x03]; $this->meta = $directions[$player->getDirection() & 0x03];
} }
if(($fy > 0.5 and $face !== self::SIDE_UP) or $face === self::SIDE_DOWN){ if(($facePos->y > 0.5 and $face !== self::SIDE_UP) or $face === self::SIDE_DOWN){
$this->meta |= self::MASK_UPPER; //top half of block $this->meta |= self::MASK_UPPER; //top half of block
} }
$this->getLevel()->setBlock($block, $this, true, true); $this->getLevel()->setBlock($block, $this, true, true);

View File

@ -132,7 +132,7 @@ class Vine extends Transparent{
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
//TODO: multiple sides //TODO: multiple sides
if($target->isSolid()){ if($target->isSolid()){
$faces = [ $faces = [

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class Water extends Liquid{ class Water extends Liquid{
@ -52,7 +53,7 @@ class Water extends Liquid{
$entity->resetFallDistance(); $entity->resetFallDistance();
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$ret = $this->getLevel()->setBlock($this, $this, true, false); $ret = $this->getLevel()->setBlock($this, $this, true, false);
$this->getLevel()->scheduleDelayedBlockUpdate($this, $this->tickRate()); $this->getLevel()->scheduleDelayedBlockUpdate($this, $this->tickRate());

View File

@ -57,7 +57,7 @@ class WaterLily extends Flowable{
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
if($target instanceof Water){ if($target instanceof Water){
$up = $target->getSide(Vector3::SIDE_UP); $up = $target->getSide(Vector3::SIDE_UP);
if($up->getId() === Block::AIR){ if($up->getId() === Block::AIR){

View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class Wood extends Solid{ class Wood extends Solid{
@ -53,7 +54,7 @@ class Wood extends Solid{
return $names[$this->meta & 0x03]; return $names[$this->meta & 0x03];
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$faces = [ $faces = [
0 => 0, 0 => 0,
1 => 0, 1 => 0,

View File

@ -26,6 +26,7 @@ namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class WoodenSlab extends Transparent{ class WoodenSlab extends Transparent{
@ -77,7 +78,7 @@ class WoodenSlab extends Transparent{
} }
} }
public function place(Item $item, Block $block, Block $target, int $face, float $fx, float $fy, float $fz, Player $player = null) : bool{ public function place(Item $item, Block $block, Block $target, int $face, Vector3 $facePos, Player $player = null) : bool{
$this->meta &= 0x07; $this->meta &= 0x07;
if($face === 0){ if($face === 0){
if($target->getId() === $this->id and ($target->getDamage() & 0x08) === 0x08 and ($target->getDamage() & 0x07) === ($this->meta)){ if($target->getId() === $this->id and ($target->getDamage() & 0x08) === 0x08 and ($target->getDamage() & 0x07) === ($this->meta)){
@ -111,7 +112,7 @@ class WoodenSlab extends Transparent{
return false; return false;
}else{ }else{
if($fy > 0.5){ if($facePos->y > 0.5){
$this->meta |= 0x08; $this->meta |= 0x08;
} }
} }

View File

@ -28,6 +28,7 @@ use pocketmine\block\Block;
use pocketmine\block\Liquid; use pocketmine\block\Liquid;
use pocketmine\event\player\PlayerBucketFillEvent; use pocketmine\event\player\PlayerBucketFillEvent;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class Bucket extends Item{ class Bucket extends Item{
@ -47,7 +48,7 @@ class Bucket extends Item{
return 0; return 0;
} }
public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ public function onActivate(Level $level, Player $player, Block $block, Block $target, int $face, Vector3 $facePos) : bool{
$targetBlock = Block::get($this->meta); $targetBlock = Block::get($this->meta);
if($targetBlock instanceof Air){ if($targetBlock instanceof Air){

View File

@ -27,6 +27,7 @@ use pocketmine\block\Block;
use pocketmine\block\Fire; use pocketmine\block\Fire;
use pocketmine\block\Solid; use pocketmine\block\Solid;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class FlintSteel extends Tool{ class FlintSteel extends Tool{
@ -34,7 +35,7 @@ class FlintSteel extends Tool{
parent::__construct(self::FLINT_STEEL, $meta, $count, "Flint and Steel"); parent::__construct(self::FLINT_STEEL, $meta, $count, "Flint and Steel");
} }
public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ public function onActivate(Level $level, Player $player, Block $block, Block $target, int $face, Vector3 $facePos) : bool{
if($block->getId() === self::AIR and ($target instanceof Solid)){ if($block->getId() === self::AIR and ($target instanceof Solid)){
$level->setBlock($block, Block::get(Block::FIRE), true); $level->setBlock($block, Block::get(Block::FIRE), true);
if(($player->gamemode & 0x01) === 0 and $this->useOn($block)){ if(($player->gamemode & 0x01) === 0 and $this->useOn($block)){

View File

@ -30,6 +30,7 @@ use pocketmine\block\Block;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\item\enchantment\Enchantment; use pocketmine\item\enchantment\Enchantment;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\math\Vector3;
use pocketmine\nbt\NBT; use pocketmine\nbt\NBT;
use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
@ -983,13 +984,11 @@ class Item implements ItemIds, \JsonSerializable{
* @param Block $block * @param Block $block
* @param Block $target * @param Block $target
* @param int $face * @param int $face
* @param float $fx * @param Vector3 $facePos
* @param float $fy
* @param float $fz
* *
* @return bool * @return bool
*/ */
public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ public function onActivate(Level $level, Player $player, Block $block, Block $target, int $face, Vector3 $facePos) : bool{
return false; return false;
} }

View File

@ -25,6 +25,7 @@ namespace pocketmine\item;
use pocketmine\block\Block; use pocketmine\block\Block;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class Painting extends Item{ class Painting extends Item{
@ -32,7 +33,7 @@ class Painting extends Item{
parent::__construct(self::PAINTING, $meta, $count, "Painting"); parent::__construct(self::PAINTING, $meta, $count, "Painting");
} }
public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ public function onActivate(Level $level, Player $player, Block $block, Block $target, int $face, Vector3 $facePos) : bool{
if($target->isTransparent() === false and $face > 1 and $block->isSolid() === false){ if($target->isTransparent() === false and $face > 1 and $block->isSolid() === false){
$faces = [ $faces = [
2 => 1, 2 => 1,

View File

@ -26,6 +26,7 @@ namespace pocketmine\item;
use pocketmine\block\Block; use pocketmine\block\Block;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\DoubleTag; use pocketmine\nbt\tag\DoubleTag;
use pocketmine\nbt\tag\FloatTag; use pocketmine\nbt\tag\FloatTag;
@ -38,7 +39,7 @@ class SpawnEgg extends Item{
parent::__construct(self::SPAWN_EGG, $meta, $count, "Spawn Egg"); parent::__construct(self::SPAWN_EGG, $meta, $count, "Spawn Egg");
} }
public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ public function onActivate(Level $level, Player $player, Block $block, Block $target, int $face, Vector3 $facePos) : bool{
$nbt = new CompoundTag("", [ $nbt = new CompoundTag("", [
new ListTag("Pos", [ new ListTag("Pos", [
new DoubleTag("", $block->getX() + 0.5), new DoubleTag("", $block->getX() + 0.5),

View File

@ -1705,18 +1705,20 @@ class Level implements ChunkManager, Metadatable{
* @param Vector3 $vector * @param Vector3 $vector
* @param Item $item * @param Item $item
* @param int $face * @param int $face
* @param float $fx default 0.0 * @param Vector3|null $facePos
* @param float $fy default 0.0 * @param Player|null $player default null
* @param float $fz default 0.0
* @param Player $player default null
* @param bool $playSound Whether to play a block-place sound if the block was placed successfully. * @param bool $playSound Whether to play a block-place sound if the block was placed successfully.
* *
* @return bool * @return bool
*/ */
public function useItemOn(Vector3 $vector, Item &$item, int $face, float $fx = 0.0, float $fy = 0.0, float $fz = 0.0, Player $player = null, bool $playSound = false) : bool{ public function useItemOn(Vector3 $vector, Item &$item, int $face, Vector3 $facePos = null, Player $player = null, bool $playSound = false) : bool{
$target = $this->getBlock($vector); $target = $this->getBlock($vector);
$block = $target->getSide($face); $block = $target->getSide($face);
if($facePos === null){
$facePos = new Vector3(0.0, 0.0, 0.0);
}
if($block->y >= $this->provider->getWorldHeight() or $block->y < 0){ if($block->y >= $this->provider->getWorldHeight() or $block->y < 0){
//TODO: build height limit messages for custom world heights and mcregion cap //TODO: build height limit messages for custom world heights and mcregion cap
return false; return false;
@ -1761,7 +1763,7 @@ class Level implements ChunkManager, Metadatable{
return true; return true;
} }
if(!$player->isSneaking() and $item->onActivate($this, $player, $block, $target, $face, $fx, $fy, $fz)){ if(!$player->isSneaking() and $item->onActivate($this, $player, $block, $target, $face, $facePos)){
if($item->getCount() <= 0){ if($item->getCount() <= 0){
$item = Item::get(Item::AIR, 0, 0); $item = Item::get(Item::AIR, 0, 0);
@ -1832,7 +1834,7 @@ class Level implements ChunkManager, Metadatable{
} }
} }
if($hand->place($item, $block, $target, $face, $fx, $fy, $fz, $player) === false){ if($hand->place($item, $block, $target, $face, $facePos, $player) === false){
return false; return false;
} }