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

Merge branch 'master' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-08-16 13:19:37 +01:00
commit 643e10037c
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ class Block extends Position implements BlockIds, Metadatable{
self::registerBlock(new Gold());
self::registerBlock(new Iron());
self::registerBlock(new DoubleStoneSlab());
self::registerBlock(new Slab());
self::registerBlock(new StoneSlab());
self::registerBlock(new Bricks());
self::registerBlock(new TNT());
self::registerBlock(new Bookshelf());

2
src/pocketmine/block/BlockIds.php
View File

@ -174,7 +174,7 @@ interface BlockIds{
const TRAPPED_CHEST = 146;
const LIGHT_WEIGHTED_PRESSURE_PLATE = 147;
const HEAVY_WEIGHTED_PRESSURE_PLATE = 148;
const COMPATATOR_BLOCK = 149, UNPOWERED_COMPARATOR = 149;
const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR = 149;
const POWERED_COMPARATOR = 150;
const DAYLIGHT_DETECTOR = 151, DAYLIGHT_SENSOR = 151;
const REDSTONE_BLOCK = 152;

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

@ -23,7 +23,6 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\level\Level;
class GlowingRedstoneOre extends RedstoneOre{

2
src/pocketmine/block/Slab.php → src/pocketmine/block/StoneSlab.php
View File

@ -26,7 +26,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\item\Tool;
class Slab extends WoodenSlab{
class StoneSlab extends WoodenSlab{
const STONE = 0;
const SANDSTONE = 1;
const WOODEN = 2;

5
src/pocketmine/network/rcon/RCON.php
View File

@ -35,10 +35,15 @@ use pocketmine\utils\TextFormat;
class RCON{
/** @var Server */
private $server;
/** @var resource */
private $socket;
/** @var string */
private $password;
/** @var int */
private $threads;
/** @var RCONInstance[] */
private $workers = [];
/** @var int */
private $clientsPerThread;
public function __construct(Server $server, string $password, int $port = 19132, string $interface = "0.0.0.0", int $threads = 1, int $clientsPerThread = 50){

10
src/pocketmine/utils/VersionString.php
View File

@ -28,9 +28,15 @@ namespace pocketmine\utils;
* Manages PocketMine-MP version strings, and compares them
*/
class VersionString{
/** @var int */
private $generation;
/** @var int */
private $major;
private $build;
/** @var int */
private $minor;
/** @var int */
private $build;
/** @var bool */
private $development = false;
/**
@ -58,7 +64,7 @@ class VersionString{
}
public function getNumber() : int{
return (int) (($this->generation << 9) + ($this->major << 5) + $this->minor);
return (($this->generation << 9) + ($this->major << 5) + $this->minor);
}
public function getGeneration() : int{