mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-01 15:49:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix formatting issues due to bad IDE settings

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-12-07 16:30:04 +01:00
parent bb82e7be50
commit 747f7685e7
191 changed files with 1315 additions and 1304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pocketmine/Player.php
View File

@ -1752,19 +1752,19 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$nbt = new Compound("", [ $nbt = new Compound("", [
"Pos" => new Enum("Pos", [ "Pos" => new Enum("Pos", [
new Double("", $this->x), new Double("", $this->x),
new Double("", $this->y + $this->getEyeHeight()), new Double("", $this->y + $this->getEyeHeight()),
new Double("", $this->z) new Double("", $this->z)
]), ]),
"Motion" => new Enum("Motion", [ "Motion" => new Enum("Motion", [
new Double("", -sin($this->yaw / 180 * M_PI) * cos($this->pitch / 180 * M_PI)), new Double("", -sin($this->yaw / 180 * M_PI) * cos($this->pitch / 180 * M_PI)),
new Double("", -sin($this->pitch / 180 * M_PI)), new Double("", -sin($this->pitch / 180 * M_PI)),
new Double("", cos($this->yaw / 180 * M_PI) * cos($this->pitch / 180 * M_PI)) new Double("", cos($this->yaw / 180 * M_PI) * cos($this->pitch / 180 * M_PI))
]), ]),
"Rotation" => new Enum("Rotation", [ "Rotation" => new Enum("Rotation", [
new Float("", $this->yaw), new Float("", $this->yaw),
new Float("", $this->pitch) new Float("", $this->pitch)
]), ]),
]); ]);
$f = 1.5; $f = 1.5;
@ -1875,7 +1875,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
if($target instanceof Entity and $this->getGamemode() !== Player::VIEW and $this->dead !== true and $target->dead !== true){ if($target instanceof Entity and $this->getGamemode() !== Player::VIEW and $this->dead !== true and $target->dead !== true){
if($target instanceof DroppedItem or $target instanceof Arrow){ if($target instanceof DroppedItem or $target instanceof Arrow){
$this->kick("Attempting to attack an invalid entity"); $this->kick("Attempting to attack an invalid entity");
$this->server->getLogger()->warning("Player ". $this->getName() ." tried to attack an invalid entity"); $this->server->getLogger()->warning("Player " . $this->getName() . " tried to attack an invalid entity");
return; return;
} }
@ -2536,7 +2536,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION: case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION:
$message = $this->getName() . " blew up"; $message = $this->getName() . " blew up";
break; break;
case EntityDamageEvent::CAUSE_MAGIC: case EntityDamageEvent::CAUSE_MAGIC:
case EntityDamageEvent::CAUSE_CUSTOM: case EntityDamageEvent::CAUSE_CUSTOM:
@ -2621,7 +2621,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$flags = 0; $flags = 0;
$flags |= $this->fireTicks > 0 ? 1 : 0; $flags |= $this->fireTicks > 0 ? 1 : 0;
//$flags |= ($this->crouched === true ? 0b10:0) << 1; //$flags |= ($this->crouched === true ? 0b10:0) << 1;
$flags |= ($this->inAction === true ? 0b10000:0); $flags |= ($this->inAction === true ? 0b10000 : 0);
$d = [ $d = [
0 => ["type" => 0, "value" => $flags], 0 => ["type" => 0, "value" => $flags],
1 => ["type" => 1, "value" => $this->airTicks], 1 => ["type" => 1, "value" => $this->airTicks],

8
src/pocketmine/PocketMine.php
View File

@ -143,8 +143,8 @@ namespace pocketmine {
if($response = Utils::getURL("http://ip-api.com/json") if($response = Utils::getURL("http://ip-api.com/json")
and $ip_geolocation_data = json_decode($response, true) and $ip_geolocation_data = json_decode($response, true)
and $ip_geolocation_data['status'] != 'fail' and $ip_geolocation_data['status'] != 'fail'
and date_default_timezone_set($ip_geolocation_data['timezone'])) and date_default_timezone_set($ip_geolocation_data['timezone'])
{ ){
//Again, for redundancy. //Again, for redundancy.
ini_set("date.timezone", $ip_geolocation_data['timezone']); ini_set("date.timezone", $ip_geolocation_data['timezone']);
}else{ }else{
@ -192,8 +192,7 @@ namespace pocketmine {
//Detect the Time Zone string //Detect the Time Zone string
preg_match($regex, $string, $matches); preg_match($regex, $string, $matches);
if(!isset($matches[2])) if(!isset($matches[2])){
{
return false; return false;
} }
@ -251,6 +250,7 @@ namespace pocketmine {
/** /**
* @param string $offset In the format of +09:00, +02:00, -04:00 etc. * @param string $offset In the format of +09:00, +02:00, -04:00 etc.
*
* @return string * @return string
*/ */
function parse_offset($offset){ function parse_offset($offset){

18
src/pocketmine/Server.php
View File

@ -149,8 +149,8 @@ class Server{
*/ */
private $tickCounter; private $tickCounter;
private $nextTick = 0; private $nextTick = 0;
private $tickAverage = [20,20,20,20,20]; private $tickAverage = [20, 20, 20, 20, 20];
private $useAverage = [20,20,20,20,20]; private $useAverage = [20, 20, 20, 20, 20];
/** @var \AttachableThreadedLogger */ /** @var \AttachableThreadedLogger */
private $logger; private $logger;
@ -1444,7 +1444,7 @@ class Server{
} }
/** /**
* @param \ClassLoader $autoloader * @param \ClassLoader $autoloader
* @param \ThreadedLogger $logger * @param \ThreadedLogger $logger
* @param string $filePath * @param string $filePath
* @param string $dataPath * @param string $dataPath
@ -1672,7 +1672,7 @@ class Server{
} }
/** /**
* @param $message * @param $message
* @param Player[]|null $recipients * @param Player[]|null $recipients
* *
* @return int * @return int
@ -1898,7 +1898,7 @@ class Server{
foreach($this->interfaces as $interface){ foreach($this->interfaces as $interface){
$interface->shutdown(); $interface->shutdown();
} }
}catch (\Exception $e){ }catch(\Exception $e){
$this->logger->emergency("Crashed while crashing, killing process"); $this->logger->emergency("Crashed while crashing, killing process");
@kill(getmypid()); @kill(getmypid());
} }
@ -2083,8 +2083,8 @@ class Server{
foreach($this->getLevels() as $level){ foreach($this->getLevels() as $level){
try{ try{
$level->doTick($currentTick); $level->doTick($currentTick);
}catch (\Exception $e){ }catch(\Exception $e){
$this->logger->critical("Could not tick level ".$level->getName().": ".$e->getMessage()); $this->logger->critical("Could not tick level " . $level->getName() . ": " . $e->getMessage());
if($this->logger instanceof MainLogger){ if($this->logger instanceof MainLogger){
$this->logger->logException($e); $this->logger->logException($e);
} }
@ -2152,7 +2152,7 @@ class Server{
private function titleTick(){ private function titleTick(){
if(defined("pocketmine\\DEBUG") and \pocketmine\DEBUG >= 0 and \pocketmine\ANSI === true){ if(defined("pocketmine\\DEBUG") and \pocketmine\DEBUG >= 0 and \pocketmine\ANSI === true){
echo "\x1b]0;". $this->getName() . " " . $this->getPocketMineVersion() . " | Online " . count($this->players) . "/" . $this->getMaxPlayers() . " | RAM " . round((memory_get_usage() / 1024) / 1024, 2) . "/" . round((memory_get_usage(true) / 1024) / 1024, 2) . " MB | U " . round($this->mainInterface->getUploadUsage() / 1024, 2) . " D " . round($this->mainInterface->getDownloadUsage() / 1024, 2) . " kB/s | TPS " . $this->getTicksPerSecond() . " | Load ". $this->getTickUsage() . "%\x07"; echo "\x1b]0;" . $this->getName() . " " . $this->getPocketMineVersion() . " | Online " . count($this->players) . "/" . $this->getMaxPlayers() . " | RAM " . round((memory_get_usage() / 1024) / 1024, 2) . "/" . round((memory_get_usage(true) / 1024) / 1024, 2) . " MB | U " . round($this->mainInterface->getUploadUsage() / 1024, 2) . " D " . round($this->mainInterface->getDownloadUsage() / 1024, 2) . " kB/s | TPS " . $this->getTicksPerSecond() . " | Load " . $this->getTickUsage() . "%\x07";
} }
} }
@ -2199,7 +2199,7 @@ class Server{
try{ try{
$this->generationManager->process(); $this->generationManager->process();
}catch (\Exception $e){ }catch(\Exception $e){
if($this->logger instanceof MainLogger){ if($this->logger instanceof MainLogger){
$this->logger->logException($e); $this->logger->logException($e);
} }

31
src/pocketmine/block/Air.php
View File

@ -20,6 +20,7 @@
*/ */
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\item\Item; use pocketmine\item\Item;
@ -39,25 +40,25 @@ class Air extends Transparent{
return "Air"; return "Air";
} }
public function isBreakable(Item $item){ public function isBreakable(Item $item){
return false; return false;
} }
public function canBeFlowedInto(){ public function canBeFlowedInto(){
return true; return true;
} }
public function canBeReplaced(){ public function canBeReplaced(){
return true; return true;
} }
public function canBePlaced(){ public function canBePlaced(){
return false; return false;
} }
public function isSolid(){ public function isSolid(){
return false; return false;
} }
public function getBoundingBox(){ public function getBoundingBox(){
return null; return null;

20
src/pocketmine/block/Bed.php
View File

@ -29,23 +29,23 @@ use pocketmine\Player;
class Bed extends Transparent{ class Bed extends Transparent{
protected $id = self::BED_BLOCK; protected $id = self::BED_BLOCK;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function canBeActivated(){ public function canBeActivated(){
return true; return true;
} }
public function getHardness(){ public function getHardness(){
return 1; return 1;
} }
public function getName(){ public function getName(){
return "Bed Block"; return "Bed Block";
} }
protected function recalculateBoundingBox(){ protected function recalculateBoundingBox(){
return new AxisAlignedBB( return new AxisAlignedBB(

14
src/pocketmine/block/Bedrock.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Bedrock extends Solid{ class Bedrock extends Solid{
protected $id = self::BEDROCK; protected $id = self::BEDROCK;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Bedrock"; return "Bedrock";
} }
public function getHardness(){ public function getHardness(){
return 18000000; return 18000000;
} }
public function isBreakable(Item $item){ public function isBreakable(Item $item){
return false; return false;

10
src/pocketmine/block/Beetroot.php
View File

@ -25,15 +25,15 @@ use pocketmine\item\Item;
class Beetroot extends Crops{ class Beetroot extends Crops{
protected $id = self::BEETROOT_BLOCK; protected $id = self::BEETROOT_BLOCK;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Beetroot Block"; return "Beetroot Block";
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = []; $drops = [];

10
src/pocketmine/block/BirchWoodStairs.php
View File

@ -25,15 +25,15 @@ use pocketmine\item\Item;
class BirchWoodStairs extends Stair{ class BirchWoodStairs extends Stair{
protected $id = self::BIRCH_WOOD_STAIRS; protected $id = self::BIRCH_WOOD_STAIRS;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Birch Wood Stairs"; return "Birch Wood Stairs";
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return [ return [

4
src/pocketmine/block/Block.php
View File

@ -782,8 +782,8 @@ class Block extends Position implements Metadatable{
} }
/** /**
* @param int $id * @param int $id
* @param int $meta * @param int $meta
*/ */
public function __construct($id, $meta = 0){ public function __construct($id, $meta = 0){
$this->id = (int) $id; $this->id = (int) $id;

14
src/pocketmine/block/Bookshelf.php
View File

@ -24,18 +24,18 @@ namespace pocketmine\block;
class Bookshelf extends Solid{ class Bookshelf extends Solid{
protected $id = self::BOOKSHELF; protected $id = self::BOOKSHELF;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Bookshelf"; return "Bookshelf";
} }
public function getHardness(){ public function getHardness(){
return 7.5; return 7.5;
} }
} }

10
src/pocketmine/block/BrickStairs.php
View File

@ -24,14 +24,14 @@ namespace pocketmine\block;
class BrickStairs extends Stair{ class BrickStairs extends Stair{
protected $id = self::BRICK_STAIRS; protected $id = self::BRICK_STAIRS;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Brick Stairs"; return "Brick Stairs";
} }
} }

14
src/pocketmine/block/Bricks.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Bricks extends Solid{ class Bricks extends Solid{
protected $id = self::BRICKS_BLOCK; protected $id = self::BRICKS_BLOCK;
public function __construct(){ public function __construct(){
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getName(){ public function getName(){
return "Bricks"; return "Bricks";
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

12
src/pocketmine/block/BrownMushroom.php
View File

@ -33,13 +33,13 @@ class BrownMushroom extends Flowable{
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Brown Mushroom"; return "Brown Mushroom";
} }
public function getLightLevel(){ public function getLightLevel(){
return 1; return 1;
} }
public function onUpdate($type){ public function onUpdate($type){
if($type === Level::BLOCK_UPDATE_NORMAL){ if($type === Level::BLOCK_UPDATE_NORMAL){

26
src/pocketmine/block/BurningFurnace.php
View File

@ -36,24 +36,24 @@ class BurningFurnace extends Solid{
protected $id = self::BURNING_FURNACE; protected $id = self::BURNING_FURNACE;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Burning Furnace"; return "Burning Furnace";
} }
public function canBeActivated(){ public function canBeActivated(){
return true; return true;
} }
public function getHardness(){ public function getHardness(){
return 17.5; return 17.5;
} }
public function getLightLevel(){ public function getLightLevel(){
return 13; return 13;
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$faces = [ $faces = [

20
src/pocketmine/block/Cactus.php
View File

@ -34,23 +34,23 @@ use pocketmine\Server;
class Cactus extends Transparent{ class Cactus extends Transparent{
protected $id = self::CACTUS; protected $id = self::CACTUS;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getHardness(){ public function getHardness(){
return 2; return 2;
} }
public function hasEntityCollision(){ public function hasEntityCollision(){
return true; return true;
} }
public function getName(){ public function getName(){
return "Cactus"; return "Cactus";
} }
protected function recalculateBoundingBox(){ protected function recalculateBoundingBox(){

22
src/pocketmine/block/Cake.php
View File

@ -30,23 +30,23 @@ use pocketmine\Server;
class Cake extends Transparent{ class Cake extends Transparent{
protected $id = self::CAKE_BLOCK; protected $id = self::CAKE_BLOCK;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function canBeActivated(){ public function canBeActivated(){
return true; return true;
} }
public function getHardness(){ public function getHardness(){
return 2.5; return 2.5;
} }
public function getName(){ public function getName(){
return "Cake Block"; return "Cake Block";
} }
protected function recalculateBoundingBox(){ protected function recalculateBoundingBox(){

50
src/pocketmine/block/Carpet.php
View File

@ -28,37 +28,37 @@ use pocketmine\Player;
class Carpet extends Flowable{ class Carpet extends Flowable{
protected $id = self::CARPET; protected $id = self::CARPET;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function isSolid(){ public function isSolid(){
return true; return true;
} }
public function getName(){ public function getName(){
static $names = [ static $names = [
0 => "White Carpet", 0 => "White Carpet",
1 => "Orange Carpet", 1 => "Orange Carpet",
2 => "Magenta Carpet", 2 => "Magenta Carpet",
3 => "Light Blue Carpet", 3 => "Light Blue Carpet",
4 => "Yellow Carpet", 4 => "Yellow Carpet",
5 => "Lime Carpet", 5 => "Lime Carpet",
6 => "Pink Carpet", 6 => "Pink Carpet",
7 => "Gray Carpet", 7 => "Gray Carpet",
8 => "Light Gray Carpet", 8 => "Light Gray Carpet",
9 => "Cyan Carpet", 9 => "Cyan Carpet",
10 => "Purple Carpet", 10 => "Purple Carpet",
11 => "Blue Carpet", 11 => "Blue Carpet",
12 => "Brown Carpet", 12 => "Brown Carpet",
13 => "Green Carpet", 13 => "Green Carpet",
14 => "Red Carpet", 14 => "Red Carpet",
15 => "Black Carpet", 15 => "Black Carpet",
]; ];
return $names[$this->meta & 0x0f]; return $names[$this->meta & 0x0f];
} }
protected function recalculateBoundingBox(){ protected function recalculateBoundingBox(){

10
src/pocketmine/block/Carrot.php
View File

@ -25,15 +25,15 @@ use pocketmine\item\Item;
class Carrot extends Crops{ class Carrot extends Crops{
protected $id = self::CARROT_BLOCK; protected $id = self::CARROT_BLOCK;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Carrot Block"; return "Carrot Block";
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = []; $drops = [];

22
src/pocketmine/block/Chest.php
View File

@ -34,23 +34,23 @@ use pocketmine\tile\Tile;
class Chest extends Transparent{ class Chest extends Transparent{
protected $id = self::CHEST; protected $id = self::CHEST;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function canBeActivated(){ public function canBeActivated(){
return true; return true;
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getName(){ public function getName(){
return "Chest"; return "Chest";
} }
protected function recalculateBoundingBox(){ protected function recalculateBoundingBox(){
return new AxisAlignedBB( return new AxisAlignedBB(

14
src/pocketmine/block/Clay.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Clay extends Solid{ class Clay extends Solid{
protected $id = self::CLAY_BLOCK; protected $id = self::CLAY_BLOCK;
public function __construct(){ public function __construct(){
} }
public function getHardness(){ public function getHardness(){
return 3; return 3;
} }
public function getName(){ public function getName(){
return "Clay Block"; return "Clay Block";
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return [ return [

14
src/pocketmine/block/Coal.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Coal extends Solid{ class Coal extends Solid{
protected $id = self::COAL_BLOCK; protected $id = self::COAL_BLOCK;
public function __construct(){ public function __construct(){
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getName(){ public function getName(){
return "Coal Block"; return "Coal Block";
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

14
src/pocketmine/block/CoalOre.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class CoalOre extends Solid{ class CoalOre extends Solid{
protected $id = self::COAL_ORE; protected $id = self::COAL_ORE;
public function __construct(){ public function __construct(){
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getName(){ public function getName(){
return "Coal Ore"; return "Coal Ore";
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

14
src/pocketmine/block/Cobblestone.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Cobblestone extends Solid{ class Cobblestone extends Solid{
protected $id = self::COBBLESTONE; protected $id = self::COBBLESTONE;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Cobblestone"; return "Cobblestone";
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

10
src/pocketmine/block/CobblestoneStairs.php
View File

@ -24,14 +24,14 @@ namespace pocketmine\block;
class CobblestoneStairs extends Stair{ class CobblestoneStairs extends Stair{
protected $id = self::COBBLESTONE_STAIRS; protected $id = self::COBBLESTONE_STAIRS;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Cobblestone Stairs"; return "Cobblestone Stairs";
} }
} }

20
src/pocketmine/block/Cobweb.php
View File

@ -32,24 +32,24 @@ class Cobweb extends Flowable{
} }
public function hasEntityCollision(){ public function hasEntityCollision(){
return true; return true;
} }
public function getName(){ public function getName(){
return "Cobweb"; return "Cobweb";
} }
public function getHardness(){ public function getHardness(){
return 25; return 25;
} }
public function onEntityCollide(Entity $entity){ public function onEntityCollide(Entity $entity){
$entity->fallDistance = 0; $entity->fallDistance = 0;
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
//TODO: correct drops //TODO: correct drops
return []; return [];
} }
} }

6
src/pocketmine/block/Crops.php
View File

@ -29,9 +29,9 @@ use pocketmine\Server;
abstract class Crops extends Flowable{ abstract class Crops extends Flowable{
public function canBeActivated(){ public function canBeActivated(){
return true; return true;
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$down = $this->getSide(0); $down = $this->getSide(0);

8
src/pocketmine/block/Dandelion.php
View File

@ -27,15 +27,15 @@ use pocketmine\Player;
class Dandelion extends Flowable{ class Dandelion extends Flowable{
protected $id = self::DANDELION; protected $id = self::DANDELION;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Dandelion"; return "Dandelion";
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

10
src/pocketmine/block/DarkOakWoodStairs.php
View File

@ -25,15 +25,15 @@ use pocketmine\item\Item;
class DarkOakWoodStairs extends Stair{ class DarkOakWoodStairs extends Stair{
protected $id = self::DARK_OAK_WOOD_STAIRS; protected $id = self::DARK_OAK_WOOD_STAIRS;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Dark Oak Wood Stairs"; return "Dark Oak Wood Stairs";
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return [ return [

10
src/pocketmine/block/DeadBush.php
View File

@ -25,21 +25,21 @@ use pocketmine\level\Level;
class DeadBush extends Flowable{ class DeadBush extends Flowable{
protected $id = self::DEAD_BUSH; protected $id = self::DEAD_BUSH;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Dead Bush"; return "Dead Bush";
} }
public function onUpdate($type){ public function onUpdate($type){
if($type === Level::BLOCK_UPDATE_NORMAL){ if($type === Level::BLOCK_UPDATE_NORMAL){
if($this->getSide(0)->isTransparent() === true){ if($this->getSide(0)->isTransparent() === true){
$this->getLevel()->useBreakOn($this); $this->getLevel()->useBreakOn($this);
return Level::BLOCK_UPDATE_NORMAL; return Level::BLOCK_UPDATE_NORMAL;
} }

14
src/pocketmine/block/Diamond.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Diamond extends Solid{ class Diamond extends Solid{
protected $id = self::DIAMOND_BLOCK; protected $id = self::DIAMOND_BLOCK;
public function __construct(){ public function __construct(){
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getName(){ public function getName(){
return "Diamond Block"; return "Diamond Block";
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

14
src/pocketmine/block/DiamondOre.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class DiamondOre extends Solid{ class DiamondOre extends Solid{
protected $id = self::DIAMOND_ORE; protected $id = self::DIAMOND_ORE;
public function __construct(){ public function __construct(){
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getName(){ public function getName(){
return "Diamond Ore"; return "Diamond Ore";
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

18
src/pocketmine/block/Dirt.php
View File

@ -32,17 +32,17 @@ class Dirt extends Solid{
} }
public function canBeActivated(){ public function canBeActivated(){
return true; return true;
} }
public function getHardness(){ public function getHardness(){
return 2.5; return 2.5;
} }
public function getName(){ public function getName(){
return "Dirt"; return "Dirt";
} }
public function onActivate(Item $item, Player $player = null){ public function onActivate(Item $item, Player $player = null){
if($item->isHoe()){ if($item->isHoe()){

12
src/pocketmine/block/Door.php
View File

@ -31,13 +31,13 @@ use pocketmine\Server;
abstract class Door extends Transparent{ abstract class Door extends Transparent{
public function canBeActivated(){ public function canBeActivated(){
return true; return true;
} }
public function isSolid(){ public function isSolid(){
return false; return false;
} }
private function getFullDamage(){ private function getFullDamage(){
$damage = $this->getDamage(); $damage = $this->getDamage();

36
src/pocketmine/block/DoubleSlab.php
View File

@ -25,29 +25,29 @@ use pocketmine\item\Item;
class DoubleSlab extends Solid{ class DoubleSlab extends Solid{
protected $id = self::DOUBLE_SLAB; protected $id = self::DOUBLE_SLAB;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getName(){ public function getName(){
static $names = [ static $names = [
0 => "Stone", 0 => "Stone",
1 => "Sandstone", 1 => "Sandstone",
2 => "Wooden", 2 => "Wooden",
3 => "Cobblestone", 3 => "Cobblestone",
4 => "Brick", 4 => "Brick",
5 => "Stone Brick", 5 => "Stone Brick",
6 => "Quartz", 6 => "Quartz",
7 => "", 7 => "",
]; ];
return "Double " . $names[$this->meta & 0x07] . " Slab"; return "Double " . $names[$this->meta & 0x07] . " Slab";
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

36
src/pocketmine/block/DoubleWoodSlab.php
View File

@ -25,29 +25,29 @@ use pocketmine\item\Item;
class DoubleWoodSlab extends Solid{ class DoubleWoodSlab extends Solid{
protected $id = self::DOUBLE_WOOD_SLAB; protected $id = self::DOUBLE_WOOD_SLAB;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getName(){ public function getName(){
static $names = [ static $names = [
0 => "Oak", 0 => "Oak",
1 => "Spruce", 1 => "Spruce",
2 => "Birch", 2 => "Birch",
3 => "Jungle", 3 => "Jungle",
4 => "Acacia", 4 => "Acacia",
5 => "Dark Oak", 5 => "Dark Oak",
6 => "", 6 => "",
7 => "" 7 => ""
]; ];
return "Double " . $names[$this->meta & 0x07] . " Wooden Slab"; return "Double " . $names[$this->meta & 0x07] . " Wooden Slab";
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isAxe()){ switch($item->isAxe()){

14
src/pocketmine/block/Emerald.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Emerald extends Solid{ class Emerald extends Solid{
protected $id = self::EMERALD_BLOCK; protected $id = self::EMERALD_BLOCK;
public function __construct(){ public function __construct(){
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getName(){ public function getName(){
return "Emerald Block"; return "Emerald Block";
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

14
src/pocketmine/block/EmeraldOre.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class EmeraldOre extends Solid{ class EmeraldOre extends Solid{
protected $id = self::EMERALD_ORE; protected $id = self::EMERALD_ORE;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Emerald Ore"; return "Emerald Ore";
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

28
src/pocketmine/block/EndPortalFrame.php
View File

@ -26,27 +26,27 @@ use pocketmine\math\AxisAlignedBB;
class EndPortalFrame extends Solid{ class EndPortalFrame extends Solid{
protected $id = self::END_PORTAL_FRAME; protected $id = self::END_PORTAL_FRAME;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getLightLevel(){ public function getLightLevel(){
return 1; return 1;
} }
public function getName(){ public function getName(){
return "End Portal Frame"; return "End Portal Frame";
} }
public function getHardness(){ public function getHardness(){
return 18000000; return 18000000;
} }
public function isBreakable(Item $item){ public function isBreakable(Item $item){
return false; return false;
} }
protected function recalculateBoundingBox(){ protected function recalculateBoundingBox(){

14
src/pocketmine/block/EndStone.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class EndStone extends Solid{ class EndStone extends Solid{
protected $id = self::END_STONE; protected $id = self::END_STONE;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "End Stone"; return "End Stone";
} }
public function getHardness(){ public function getHardness(){
return 45; return 45;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

16
src/pocketmine/block/Farmland.php
View File

@ -26,19 +26,19 @@ use pocketmine\math\AxisAlignedBB;
class Farmland extends Solid{ class Farmland extends Solid{
protected $id = self::FARMLAND; protected $id = self::FARMLAND;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Farmland"; return "Farmland";
} }
public function getHardness(){ public function getHardness(){
return 3; return 3;
} }
protected function recalculateBoundingBox(){ protected function recalculateBoundingBox(){
return new AxisAlignedBB( return new AxisAlignedBB(

16
src/pocketmine/block/Fence.php
View File

@ -25,19 +25,19 @@ use pocketmine\math\AxisAlignedBB;
class Fence extends Transparent{ class Fence extends Transparent{
protected $id = self::FENCE; protected $id = self::FENCE;
public function __construct(){ public function __construct(){
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getName(){ public function getName(){
return "Oak Fence"; return "Oak Fence";
} }
protected function recalculateBoundingBox(){ protected function recalculateBoundingBox(){
@ -46,7 +46,7 @@ class Fence extends Transparent{
$flag2 = $this->canConnect($this->getSide(4)); $flag2 = $this->canConnect($this->getSide(4));
$flag3 = $this->canConnect($this->getSide(5)); $flag3 = $this->canConnect($this->getSide(5));
$f = $flag2 ? 0 : 0.375; $f = $flag2 ? 0 : 0.375;
$f1 = $flag3 ? 1 : 0.625; $f1 = $flag3 ? 1 : 0.625;
$f2 = $flag ? 0 : 0.375; $f2 = $flag ? 0 : 0.375;
$f3 = $flag1 ? 1 : 0.625; $f3 = $flag1 ? 1 : 0.625;

6
src/pocketmine/block/FenceAcacia.php
View File

@ -23,9 +23,9 @@ namespace pocketmine\block;
class FenceAcacia extends Fence{ class FenceAcacia extends Fence{
protected $id = self::FENCE_ACACIA; protected $id = self::FENCE_ACACIA;
public function getName(){ public function getName(){
return "Acacia Fence"; return "Acacia Fence";
} }
} }

8
src/pocketmine/block/FenceBirch.php
View File

@ -23,9 +23,9 @@ namespace pocketmine\block;
class FenceBirch extends Fence{ class FenceBirch extends Fence{
protected $id = self::FENCE_BIRCH; protected $id = self::FENCE_BIRCH;
public function getName(){ public function getName(){
return "Birch Fence"; return "Birch Fence";
} }
} }

8
src/pocketmine/block/FenceDarkOak.php
View File

@ -23,9 +23,9 @@ namespace pocketmine\block;
class FenceDarkOak extends Fence{ class FenceDarkOak extends Fence{
protected $id = self::FENCE_DARK_OAK; protected $id = self::FENCE_DARK_OAK;
public function getName(){ public function getName(){
return "Dark Oak Fence"; return "Dark Oak Fence";
} }
} }

22
src/pocketmine/block/FenceGate.php
View File

@ -27,23 +27,23 @@ use pocketmine\Player;
class FenceGate extends Transparent{ class FenceGate extends Transparent{
protected $id = self::FENCE_GATE; protected $id = self::FENCE_GATE;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Oak Fence Gate"; return "Oak Fence Gate";
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function canBeActivated(){ public function canBeActivated(){
return true; return true;
} }
protected function recalculateBoundingBox(){ protected function recalculateBoundingBox(){

8
src/pocketmine/block/FenceGateAcacia.php
View File

@ -24,9 +24,9 @@ namespace pocketmine\block;
class FenceGateAcacia extends FenceGate{ class FenceGateAcacia extends FenceGate{
protected $id = self::FENCE_GATE_ACACIA; protected $id = self::FENCE_GATE_ACACIA;
public function getName(){ public function getName(){
return "Acacia Fence Gate"; return "Acacia Fence Gate";
} }
} }

8
src/pocketmine/block/FenceGateBirch.php
View File

@ -24,9 +24,9 @@ namespace pocketmine\block;
class FenceGateBirch extends FenceGate{ class FenceGateBirch extends FenceGate{
protected $id = self::FENCE_GATE_BIRCH; protected $id = self::FENCE_GATE_BIRCH;
public function getName(){ public function getName(){
return "Birch Fence Gate"; return "Birch Fence Gate";
} }
} }

8
src/pocketmine/block/FenceGateDarkOak.php
View File

@ -24,9 +24,9 @@ namespace pocketmine\block;
class FenceGateDarkOak extends FenceGate{ class FenceGateDarkOak extends FenceGate{
protected $id = self::FENCE_GATE_DARK_OAK; protected $id = self::FENCE_GATE_DARK_OAK;
public function getName(){ public function getName(){
return "Dark Oak Fence Gate"; return "Dark Oak Fence Gate";
} }
} }

8
src/pocketmine/block/FenceGateJungle.php
View File

@ -24,9 +24,9 @@ namespace pocketmine\block;
class FenceGateJungle extends FenceGate{ class FenceGateJungle extends FenceGate{
protected $id = self::FENCE_GATE_JUNGLE; protected $id = self::FENCE_GATE_JUNGLE;
public function getName(){ public function getName(){
return "Jungle Fence Gate"; return "Jungle Fence Gate";
} }
} }

8
src/pocketmine/block/FenceGateSpruce.php
View File

@ -24,9 +24,9 @@ namespace pocketmine\block;
class FenceGateSpruce extends FenceGate{ class FenceGateSpruce extends FenceGate{
protected $id = self::FENCE_GATE_SPRUCE; protected $id = self::FENCE_GATE_SPRUCE;
public function getName(){ public function getName(){
return "Spruce Fence Gate"; return "Spruce Fence Gate";
} }
} }

8
src/pocketmine/block/FenceJungle.php
View File

@ -23,9 +23,9 @@ namespace pocketmine\block;
class FenceJungle extends Fence{ class FenceJungle extends Fence{
protected $id = self::FENCE_JUNGLE; protected $id = self::FENCE_JUNGLE;
public function getName(){ public function getName(){
return "Jungle Fence"; return "Jungle Fence";
} }
} }

8
src/pocketmine/block/FenceSpruce.php
View File

@ -23,9 +23,9 @@ namespace pocketmine\block;
class FenceSpruce extends Fence{ class FenceSpruce extends Fence{
protected $id = self::FENCE_SPRUCE; protected $id = self::FENCE_SPRUCE;
public function getName(){ public function getName(){
return "Spruce Fence"; return "Spruce Fence";
} }
} }

32
src/pocketmine/block/Fire.php
View File

@ -31,31 +31,31 @@ use pocketmine\Server;
class Fire extends Flowable{ class Fire extends Flowable{
protected $id = self::FIRE; protected $id = self::FIRE;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function hasEntityCollision(){ public function hasEntityCollision(){
return true; return true;
} }
public function getName(){ public function getName(){
return "Fire Block"; return "Fire Block";
} }
public function getLightLevel(){ public function getLightLevel(){
return 15; return 15;
} }
public function isBreakable(Item $item){ public function isBreakable(Item $item){
return false; return false;
} }
public function canBeReplaced(){ public function canBeReplaced(){
return true; return true;
} }
public function onEntityCollide(Entity $entity){ public function onEntityCollide(Entity $entity){
$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1); $ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);

24
src/pocketmine/block/Flowable.php
View File

@ -24,19 +24,19 @@ namespace pocketmine\block;
abstract class Flowable extends Transparent{ abstract class Flowable extends Transparent{
public function canBeFlowedInto(){ public function canBeFlowedInto(){
return true; return true;
} }
public function isSolid(){ public function isSolid(){
return false; return false;
} }
public function getBoundingBox(){ public function getBoundingBox(){
return null; return null;
} }
public function getHardness(){ public function getHardness(){
return 0; return 0;
} }
} }

8
src/pocketmine/block/Furnace.php
View File

@ -24,9 +24,9 @@ namespace pocketmine\block;
class Furnace extends BurningFurnace{ class Furnace extends BurningFurnace{
protected $id = self::FURNACE; protected $id = self::FURNACE;
public function getName(){ public function getName(){
return "Furnace"; return "Furnace";
} }
} }

16
src/pocketmine/block/Glass.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Glass extends Transparent{ class Glass extends Transparent{
protected $id = self::GLASS; protected $id = self::GLASS;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Glass"; return "Glass";
} }
public function getHardness(){ public function getHardness(){
return 1.5; return 1.5;
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return []; return [];

18
src/pocketmine/block/GlassPane.php
View File

@ -24,18 +24,18 @@ namespace pocketmine\block;
class GlassPane extends Thin{ class GlassPane extends Thin{
protected $id = self::GLASS_PANE; protected $id = self::GLASS_PANE;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Glass Pane"; return "Glass Pane";
} }
public function getHardness(){ public function getHardness(){
return 1.5; return 1.5;
} }
} }

14
src/pocketmine/block/GlowingObsidian.php
View File

@ -27,15 +27,15 @@ class GlowingObsidian extends Solid{
protected $id = self::GLOWING_OBSIDIAN; protected $id = self::GLOWING_OBSIDIAN;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Glowing Obsidian"; return "Glowing Obsidian";
} }
public function getLightLevel(){ public function getLightLevel(){
return 12; return 12;
} }
} }

18
src/pocketmine/block/GlowingRedstoneOre.php
View File

@ -32,17 +32,17 @@ class GlowingRedstoneOre extends Solid{
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getName(){ public function getName(){
return "Glowing Redstone Ore"; return "Glowing Redstone Ore";
} }
public function getLightLevel(){ public function getLightLevel(){
return 9; return 9;
} }
public function onUpdate($type){ public function onUpdate($type){
if($type === Level::BLOCK_UPDATE_SCHEDULED or $type === Level::BLOCK_UPDATE_RANDOM){ if($type === Level::BLOCK_UPDATE_SCHEDULED or $type === Level::BLOCK_UPDATE_RANDOM){

20
src/pocketmine/block/Glowstone.php
View File

@ -25,23 +25,23 @@ use pocketmine\item\Item;
class Glowstone extends Transparent{ class Glowstone extends Transparent{
protected $id = self::GLOWSTONE_BLOCK; protected $id = self::GLOWSTONE_BLOCK;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Glowstone"; return "Glowstone";
} }
public function getHardness(){ public function getHardness(){
return 1.5; return 1.5;
} }
public function getLightLevel(){ public function getLightLevel(){
return 15; return 15;
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return [ return [

14
src/pocketmine/block/Gold.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Gold extends Solid{ class Gold extends Solid{
protected $id = self::GOLD_BLOCK; protected $id = self::GOLD_BLOCK;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Gold Block"; return "Gold Block";
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

14
src/pocketmine/block/GoldOre.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class GoldOre extends Solid{ class GoldOre extends Solid{
protected $id = self::GOLD_ORE; protected $id = self::GOLD_ORE;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Gold Ore"; return "Gold Ore";
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

18
src/pocketmine/block/Grass.php
View File

@ -38,17 +38,17 @@ class Grass extends Solid{
} }
public function canBeActivated(){ public function canBeActivated(){
return true; return true;
} }
public function getName(){ public function getName(){
return "Grass"; return "Grass";
} }
public function getHardness(){ public function getHardness(){
return 3; return 3;
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return [ return [

14
src/pocketmine/block/Gravel.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Gravel extends Fallable{ class Gravel extends Fallable{
protected $id = self::GRAVEL; protected $id = self::GRAVEL;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Gravel"; return "Gravel";
} }
public function getHardness(){ public function getHardness(){
return 3; return 3;
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
if(mt_rand(1, 10) === 1){ if(mt_rand(1, 10) === 1){

14
src/pocketmine/block/HardenedClay.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class HardenedClay extends Solid{ class HardenedClay extends Solid{
protected $id = self::HARDENED_CLAY; protected $id = self::HARDENED_CLAY;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Hardened Clay"; return "Hardened Clay";
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

14
src/pocketmine/block/HayBale.php
View File

@ -26,19 +26,19 @@ use pocketmine\Player;
class HayBale extends Solid{ class HayBale extends Solid{
protected $id = self::HAY_BALE; protected $id = self::HAY_BALE;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Hay Bale"; return "Hay Bale";
} }
public function getHardness(){ public function getHardness(){
return 10; return 10;
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
$faces = [ $faces = [

14
src/pocketmine/block/Ice.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Ice extends Transparent{ class Ice extends Transparent{
protected $id = self::ICE; protected $id = self::ICE;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Ice"; return "Ice";
} }
public function getHardness(){ public function getHardness(){
return 2.5; return 2.5;
} }
public function onBreak(Item $item){ public function onBreak(Item $item){
$this->getLevel()->setBlock($this, new Water(), true); $this->getLevel()->setBlock($this, new Water(), true);

14
src/pocketmine/block/Iron.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Iron extends Solid{ class Iron extends Solid{
protected $id = self::IRON_BLOCK; protected $id = self::IRON_BLOCK;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Iron Block"; return "Iron Block";
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

8
src/pocketmine/block/IronBars.php
View File

@ -24,14 +24,14 @@ namespace pocketmine\block;
class IronBars extends Thin{ class IronBars extends Thin{
protected $id = self::IRON_BARS; protected $id = self::IRON_BARS;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Iron Bars"; return "Iron Bars";
} }
} }

14
src/pocketmine/block/IronDoor.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class IronDoor extends Door{ class IronDoor extends Door{
protected $id = self::IRON_DOOR_BLOCK; protected $id = self::IRON_DOOR_BLOCK;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Iron Door Block"; return "Iron Door Block";
} }
public function getHardness(){ public function getHardness(){
return 25; return 25;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

14
src/pocketmine/block/IronOre.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class IronOre extends Solid{ class IronOre extends Solid{
protected $id = self::IRON_ORE; protected $id = self::IRON_ORE;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Iron Ore"; return "Iron Ore";
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

10
src/pocketmine/block/JungleWoodStairs.php
View File

@ -25,15 +25,15 @@ use pocketmine\item\Item;
class JungleWoodStairs extends Stair{ class JungleWoodStairs extends Stair{
protected $id = self::JUNGLE_WOOD_STAIRS; protected $id = self::JUNGLE_WOOD_STAIRS;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Jungle Wood Stairs"; return "Jungle Wood Stairs";
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return [ return [

24
src/pocketmine/block/Ladder.php
View File

@ -35,21 +35,21 @@ class Ladder extends Transparent{
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Ladder"; return "Ladder";
} }
public function hasEntityCollision(){ public function hasEntityCollision(){
return true; return true;
} }
public function isSolid(){ public function isSolid(){
return false; return false;
} }
public function getHardness(){ public function getHardness(){
return 2; return 2;
} }
public function onEntityCollide(Entity $entity){ public function onEntityCollide(Entity $entity){
$entity->fallDistance = 0; $entity->fallDistance = 0;

14
src/pocketmine/block/Lapis.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Lapis extends Solid{ class Lapis extends Solid{
protected $id = self::LAPIS_BLOCK; protected $id = self::LAPIS_BLOCK;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Lapis Block"; return "Lapis Block";
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){

14
src/pocketmine/block/LapisOre.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class LapisOre extends Solid{ class LapisOre extends Solid{
protected $id = self::LAPIS_ORE; protected $id = self::LAPIS_ORE;
public function __construct(){ public function __construct(){
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getName(){ public function getName(){
return "Lapis Ore"; return "Lapis Ore";
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){

18
src/pocketmine/block/Lava.php
View File

@ -37,17 +37,17 @@ class Lava extends Liquid{
$this->meta = $meta; $this->meta = $meta;
} }
public function getLightLevel(){ public function getLightLevel(){
return 15; return 15;
} }
public function getName(){ public function getName(){
return "Lava"; return "Lava";
} }
public function getHardness(){ public function getHardness(){
return 0; return 0;
} }
public function onEntityCollide(Entity $entity){ public function onEntityCollide(Entity $entity){
$entity->fallDistance *= 0.5; $entity->fallDistance *= 0.5;

26
src/pocketmine/block/Leaves.php
View File

@ -35,25 +35,25 @@ class Leaves extends Transparent{
const ACACIA = 0; const ACACIA = 0;
const DARK_OAK = 1; const DARK_OAK = 1;
protected $id = self::LEAVES; protected $id = self::LEAVES;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getHardness(){ public function getHardness(){
return 1; return 1;
} }
public function getName(){ public function getName(){
static $names = [ static $names = [
self::OAK => "Oak Leaves", self::OAK => "Oak Leaves",
self::SPRUCE => "Spruce Leaves", self::SPRUCE => "Spruce Leaves",
self::BIRCH => "Birch Leaves", self::BIRCH => "Birch Leaves",
self::JUNGLE => "Jungle Leaves", self::JUNGLE => "Jungle Leaves",
]; ];
return $names[$this->meta & 0x03]; return $names[$this->meta & 0x03];
} }
private function findLog(Block $pos, array $visited, $distance, &$check, $fromSide = null){ private function findLog(Block $pos, array $visited, $distance, &$check, $fromSide = null){
++$check; ++$check;

16
src/pocketmine/block/Leaves2.php
View File

@ -29,19 +29,19 @@ use pocketmine\Server;
class Leaves2 extends Leaves{ class Leaves2 extends Leaves{
protected $id = self::LEAVES2; protected $id = self::LEAVES2;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
static $names = [ static $names = [
self::ACACIA => "Acacia Leaves", self::ACACIA => "Acacia Leaves",
self::DARK_OAK => "Dark Oak Leaves", self::DARK_OAK => "Dark Oak Leaves",
]; ];
return $names[$this->meta & 0x01]; return $names[$this->meta & 0x01];
} }
private function findLog(Block $pos, array $visited, $distance, &$check, $fromSide = null){ private function findLog(Block $pos, array $visited, $distance, &$check, $fromSide = null){
++$check; ++$check;

24
src/pocketmine/block/Liquid.php
View File

@ -29,21 +29,21 @@ use pocketmine\math\Vector3;
abstract class Liquid extends Transparent{ abstract class Liquid extends Transparent{
public function hasEntityCollision(){ public function hasEntityCollision(){
return true; return true;
} }
public function isBreakable(Item $item){ public function isBreakable(Item $item){
return false; return false;
} }
public function canBeReplaced(){ public function canBeReplaced(){
return true; return true;
} }
public function isSolid(){ public function isSolid(){
return false; return false;
} }
public $adjacentSources = 0; public $adjacentSources = 0;
public $isOptimalFlowDirection = [0, 0, 0, 0]; public $isOptimalFlowDirection = [0, 0, 0, 0];

22
src/pocketmine/block/LitPumpkin.php
View File

@ -26,22 +26,22 @@ use pocketmine\Player;
class LitPumpkin extends Solid{ class LitPumpkin extends Solid{
protected $id = self::LIT_PUMPKIN; protected $id = self::LIT_PUMPKIN;
public function getLightLevel(){ public function getLightLevel(){
return 15; return 15;
} }
public function getHardness(){ public function getHardness(){
return 5; return 5;
} }
public function getName(){ public function getName(){
return "Jack o'Lantern"; return "Jack o'Lantern";
} }
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

14
src/pocketmine/block/Melon.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Melon extends Transparent{ class Melon extends Transparent{
protected $id = self::MELON_BLOCK; protected $id = self::MELON_BLOCK;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Melon Block"; return "Melon Block";
} }
public function getHardness(){ public function getHardness(){
return 5; return 5;
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return [ return [

8
src/pocketmine/block/MelonStem.php
View File

@ -28,11 +28,11 @@ use pocketmine\Server;
class MelonStem extends Crops{ class MelonStem extends Crops{
protected $id = self::MELON_STEM; protected $id = self::MELON_STEM;
public function getName(){ public function getName(){
return "Melon Stem"; return "Melon Stem";
} }
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;

54
src/pocketmine/block/MonsterSpawner.php
View File

@ -25,38 +25,38 @@ use pocketmine\item\Item;
class MonsterSpawner extends Solid{ class MonsterSpawner extends Solid{
protected $id = self::MONSTER_SPAWNER; protected $id = self::MONSTER_SPAWNER;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getHardness(){ public function getHardness(){
return 25; return 25;
} }
public function getName(){ public function getName(){
return "Monster Spawner"; return "Monster Spawner";
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){
switch($item->isPickaxe()){ switch($item->isPickaxe()){
case 5: case 5:
return 0.95; return 0.95;
case 4: case 4:
return 1.25; return 1.25;
case 3: case 3:
return 1.9; return 1.9;
case 2: case 2:
return 0.65; return 0.65;
case 1: case 1:
return 3.75; return 3.75;
default: default:
return 25; return 25;
} }
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return []; return [];
} }
} }

14
src/pocketmine/block/MossStone.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class MossStone extends Solid{ class MossStone extends Solid{
protected $id = self::MOSS_STONE; protected $id = self::MOSS_STONE;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Moss Stone"; return "Moss Stone";
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){

14
src/pocketmine/block/Mycelium.php
View File

@ -29,19 +29,19 @@ use pocketmine\Server;
class Mycelium extends Solid{ class Mycelium extends Solid{
protected $id = self::MYCELIUM; protected $id = self::MYCELIUM;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Mycelium"; return "Mycelium";
} }
public function getHardness() { public function getHardness(){
return 2.5; return 2.5;
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
return [ return [

14
src/pocketmine/block/NetherBrick.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class NetherBrick extends Solid{ class NetherBrick extends Solid{
protected $id = self::NETHER_BRICKS; protected $id = self::NETHER_BRICKS;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Nether Bricks"; return "Nether Bricks";
} }
public function getHardness(){ public function getHardness(){
return 30; return 30;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){

8
src/pocketmine/block/NetherBrickStairs.php
View File

@ -24,11 +24,11 @@ namespace pocketmine\block;
class NetherBrickStairs extends Stair{ class NetherBrickStairs extends Stair{
protected $id = self::NETHER_BRICKS_STAIRS; protected $id = self::NETHER_BRICKS_STAIRS;
public function getName(){ public function getName(){
return "Nether Bricks Stairs"; return "Nether Bricks Stairs";
} }
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;

14
src/pocketmine/block/NetherReactor.php
View File

@ -24,18 +24,18 @@ namespace pocketmine\block;
class NetherReactor extends Solid{ class NetherReactor extends Solid{
protected $id = self::NETHER_REACTOR; protected $id = self::NETHER_REACTOR;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Nether Reactor"; return "Nether Reactor";
} }
public function canBeActivated(){ public function canBeActivated(){
return true; return true;
} }
} }

16
src/pocketmine/block/Netherrack.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Netherrack extends Solid{ class Netherrack extends Solid{
protected $id = self::NETHERRACK; protected $id = self::NETHERRACK;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Netherrack"; return "Netherrack";
} }
public function getHardness(){ public function getHardness(){
return 2; return 2;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){

14
src/pocketmine/block/Obsidian.php
View File

@ -25,19 +25,19 @@ use pocketmine\item\Item;
class Obsidian extends Solid{ class Obsidian extends Solid{
protected $id = self::OBSIDIAN; protected $id = self::OBSIDIAN;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Obsidian"; return "Obsidian";
} }
public function getHardness(){ public function getHardness(){
return 6000; return 6000;
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){

34
src/pocketmine/block/Planks.php
View File

@ -30,28 +30,28 @@ class Planks extends Solid{
const ACACIA = 4; const ACACIA = 4;
const DARK_OAK = 5; const DARK_OAK = 5;
protected $id = self::WOODEN_PLANKS; protected $id = self::WOODEN_PLANKS;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function getName(){ public function getName(){
static $names = [ static $names = [
self::OAK => "Oak Wood Planks", self::OAK => "Oak Wood Planks",
self::SPRUCE => "Spruce Wood Planks", self::SPRUCE => "Spruce Wood Planks",
self::BIRCH => "Birch Wood Planks", self::BIRCH => "Birch Wood Planks",
self::JUNGLE => "Jungle Wood Planks", self::JUNGLE => "Jungle Wood Planks",
self::ACACIA => "Acacia Wood Planks", self::ACACIA => "Acacia Wood Planks",
self::DARK_OAK => "Jungle Wood Planks", self::DARK_OAK => "Jungle Wood Planks",
"", "",
"" ""
]; ];
return $names[$this->meta & 0x07]; return $names[$this->meta & 0x07];
} }
} }

14
src/pocketmine/block/Podzol.php
View File

@ -23,17 +23,17 @@ namespace pocketmine\block;
class Podzol extends Solid{ class Podzol extends Solid{
protected $id = self::PODZOL; protected $id = self::PODZOL;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Podzol"; return "Podzol";
} }
public function getHardness(){ public function getHardness(){
return 2.5; return 2.5;
} }
} }

10
src/pocketmine/block/Poppy.php
View File

@ -27,15 +27,15 @@ use pocketmine\Player;
class Poppy extends Flowable{ class Poppy extends Flowable{
protected $id = self::POPPY; protected $id = self::POPPY;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Poppy"; return "Poppy";
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

8
src/pocketmine/block/Potato.php
View File

@ -25,15 +25,15 @@ use pocketmine\item\Item;
class Potato extends Crops{ class Potato extends Crops{
protected $id = self::POTATO_BLOCK; protected $id = self::POTATO_BLOCK;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Potato Block"; return "Potato Block";
} }
public function getDrops(Item $item){ public function getDrops(Item $item){
$drops = []; $drops = [];

14
src/pocketmine/block/Pumpkin.php
View File

@ -26,19 +26,19 @@ use pocketmine\Player;
class Pumpkin extends Solid{ class Pumpkin extends Solid{
protected $id = self::PUMPKIN; protected $id = self::PUMPKIN;
public function __construct(){ public function __construct(){
} }
public function getHardness(){ public function getHardness(){
return 5; return 5;
} }
public function getName(){ public function getName(){
return "Pumpkin"; return "Pumpkin";
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
if($player instanceof Player){ if($player instanceof Player){

8
src/pocketmine/block/PumpkinStem.php
View File

@ -28,15 +28,15 @@ use pocketmine\Server;
class PumpkinStem extends Crops{ class PumpkinStem extends Crops{
protected $id = self::PUMPKIN_STEM; protected $id = self::PUMPKIN_STEM;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Pumpkin Stem"; return "Pumpkin Stem";
} }
public function onUpdate($type){ public function onUpdate($type){
if($type === Level::BLOCK_UPDATE_NORMAL){ if($type === Level::BLOCK_UPDATE_NORMAL){

20
src/pocketmine/block/Quartz.php
View File

@ -25,21 +25,21 @@ use pocketmine\item\Item;
class Quartz extends Solid{ class Quartz extends Solid{
protected $id = self::QUARTZ_BLOCK; protected $id = self::QUARTZ_BLOCK;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
static $names = [ static $names = [
0 => "Quartz Block", 0 => "Quartz Block",
1 => "Chiseled Quartz Block", 1 => "Chiseled Quartz Block",
2 => "Quartz Pillar", 2 => "Quartz Pillar",
3 => "Quartz Pillar", 3 => "Quartz Pillar",
]; ];
return $names[$this->meta & 0x03]; return $names[$this->meta & 0x03];
} }
public function getBreakTime(Item $item){ public function getBreakTime(Item $item){

10
src/pocketmine/block/QuartzStairs.php
View File

@ -24,14 +24,14 @@ namespace pocketmine\block;
class QuartzStairs extends Stair{ class QuartzStairs extends Stair{
protected $id = self::QUARTZ_STAIRS; protected $id = self::QUARTZ_STAIRS;
public function __construct($meta = 0){ public function __construct($meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }
public function getName(){ public function getName(){
return "Quartz Stairs"; return "Quartz Stairs";
} }
} }

6
src/pocketmine/block/RedMushroom.php
View File

@ -27,15 +27,15 @@ use pocketmine\Player;
class RedMushroom extends Flowable{ class RedMushroom extends Flowable{
protected $id = self::RED_MUSHROOM; protected $id = self::RED_MUSHROOM;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Red Mushroom"; return "Red Mushroom";
} }
public function onUpdate($type){ public function onUpdate($type){

14
src/pocketmine/block/RedstoneOre.php
View File

@ -26,19 +26,19 @@ use pocketmine\level\Level;
class RedstoneOre extends Solid{ class RedstoneOre extends Solid{
protected $id = self::REDSTONE_ORE; protected $id = self::REDSTONE_ORE;
public function __construct(){ public function __construct(){
} }
public function getName(){ public function getName(){
return "Redstone Ore"; return "Redstone Ore";
} }
public function getHardness(){ public function getHardness(){
return 15; return 15;
} }
public function onUpdate($type){ public function onUpdate($type){
if($type === Level::BLOCK_UPDATE_NORMAL or $type === Level::BLOCK_UPDATE_TOUCH){ if($type === Level::BLOCK_UPDATE_NORMAL or $type === Level::BLOCK_UPDATE_TOUCH){

Some files were not shown because too many files have changed in this diff Show More