mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +00:00
Code Issues Projects Releases Wiki Activity

s/facePos/clickVector/

Browse Source 
clickVector better describes this
This commit is contained in:
Dylan K. Taylor
2017-10-27 19:05:26 +01:00
parent c55bc2d7e9
commit d1db27016e
51 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pocketmine/level/Level.php
View File

@ -1722,18 +1722,18 @@ class Level implements ChunkManager, Metadatable{
* @param Vector3 $vector
* @param Item $item
* @param int $face
* @param Vector3|null $facePos
* @param Vector3|null $clickVector
* @param Player|null $player default null
* @param bool $playSound Whether to play a block-place sound if the block was placed successfully.
*
* @return bool
*/
public function useItemOn(Vector3 $vector, Item &$item, int $face, Vector3 $facePos = null, Player $player = null, bool $playSound = false) : bool{
public function useItemOn(Vector3 $vector, Item &$item, int $face, Vector3 $clickVector = null, Player $player = null, bool $playSound = false) : bool{
$blockClicked = $this->getBlock($vector);
$blockReplace = $blockClicked->getSide($face);
if($facePos === null){
$facePos = new Vector3(0.0, 0.0, 0.0);
if($clickVector === null){
$clickVector = new Vector3(0.0, 0.0, 0.0);
}
if($blockReplace->y >= $this->provider->getWorldHeight() or $blockReplace->y < 0){
@ -1746,7 +1746,7 @@ class Level implements ChunkManager, Metadatable{
}
if($player !== null){
$ev = new PlayerInteractEvent($player, $item, $blockClicked, $facePos, $face, $blockClicked->getId() === 0 ? PlayerInteractEvent::RIGHT_CLICK_AIR : PlayerInteractEvent::RIGHT_CLICK_BLOCK);
$ev = new PlayerInteractEvent($player, $item, $blockClicked, $clickVector, $face, $blockClicked->getId() === 0 ? PlayerInteractEvent::RIGHT_CLICK_AIR : PlayerInteractEvent::RIGHT_CLICK_BLOCK);
if($this->checkSpawnProtection($player, $blockClicked)){
$ev->setCancelled(); //set it to cancelled so plugins can bypass this
}
@ -1776,7 +1776,7 @@ class Level implements ChunkManager, Metadatable{
return true;
}
if(!$player->isSneaking() and $item->onActivate($this, $player, $blockReplace, $blockClicked, $face, $facePos)){
if(!$player->isSneaking() and $item->onActivate($this, $player, $blockReplace, $blockClicked, $face, $clickVector)){
return true;
}
}else{
@ -1793,10 +1793,10 @@ class Level implements ChunkManager, Metadatable{
return false;
}
if($hand->canBePlacedAt($blockClicked, $facePos, $face, true)){
if($hand->canBePlacedAt($blockClicked, $clickVector, $face, true)){
$blockReplace = $blockClicked;
$hand->position($blockReplace);
}elseif(!$hand->canBePlacedAt($blockReplace, $facePos, $face, false)){
}elseif(!$hand->canBePlacedAt($blockReplace, $clickVector, $face, false)){
return false;
}
@ -1835,7 +1835,7 @@ class Level implements ChunkManager, Metadatable{
}
}
if(!$hand->place($item, $blockReplace, $blockClicked, $face, $facePos, $player)){
if(!$hand->place($item, $blockReplace, $blockClicked, $face, $clickVector, $player)){
return false;
}