mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-21 12:09:43 +00:00
better break time checks, added block materials
This commit is contained in:
parent
71da620aa3
commit
625e9ca71f
143 changed files with 496 additions and 54 deletions
|
|
@ -133,12 +133,18 @@ abstract class Block extends Position{
|
|||
INFO_UPDATE2 => "InfoUpdate2Block",
|
||||
RESERVED6 => "Reserved6Block",
|
||||
);
|
||||
|
||||
/**
|
||||
* @var Material
|
||||
*/
|
||||
public $material;
|
||||
|
||||
public $id;
|
||||
public $meta;
|
||||
public $name;
|
||||
public $breakTime;
|
||||
public $boundingBox;
|
||||
public $hardness;
|
||||
public $breakTime = 0;
|
||||
public $isActivable = false;
|
||||
public $breakable = true;
|
||||
public $isFlowable = false;
|
||||
|
|
@ -259,6 +265,17 @@ abstract class Block extends Position{
|
|||
return $this->meta & 0x0F;
|
||||
}
|
||||
|
||||
public function getDestroyProgress(Player $player){
|
||||
if($this->breakTime < 0) return 0;
|
||||
$id = $this->getID();
|
||||
$meta = $this->getMetadata();
|
||||
if($player->canDestroy($id, $meta)){
|
||||
return $player->getDestroySpeed($id, $meta) / $this->breakTime / 30;
|
||||
}
|
||||
if($this->breakTime == 0) return INF; //instabreak
|
||||
return (1 / $this->breakTime) / 100;
|
||||
}
|
||||
|
||||
final public function position(Position $v){
|
||||
$this->level = $v->level;
|
||||
$this->x = (int) $v->x;
|
||||
|
|
@ -278,9 +295,11 @@ abstract class Block extends Position{
|
|||
}
|
||||
|
||||
public function getBreakTime(Item $item, Player $player){
|
||||
if($this->hardness < 0) return INF;
|
||||
if(($player->gamemode & 0x01) === 0x01){
|
||||
return 0.15;
|
||||
}
|
||||
if($player->canDestroy($this->getID(), $this->getMetadata()))
|
||||
return $this->breakTime;
|
||||
}
|
||||
|
||||
|
|
@ -296,7 +315,9 @@ abstract class Block extends Position{
|
|||
return "Block ". $this->name ." (".$this->id.":".$this->meta.")";
|
||||
}
|
||||
|
||||
abstract function isBreakable(Item $item, Player $player);
|
||||
public function isBreakable(Item $item, Player $player){
|
||||
return $this->hardness >= 0;
|
||||
}
|
||||
|
||||
abstract function onBreak(Item $item, Player $player);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue