Merge branch 'master' into mcpe-1.2

.travis.yml

@@ -8,7 +8,7 @@ before_script:
  - echo | pecl install channel://pecl.php.net/yaml-2.0.2
  - git clone https://github.com/krakjoe/pthreads.git
  - cd pthreads
- - git checkout caca8dc42a5d75ddfb39e6fd15337e87e967517e #master is broken - https://github.com/krakjoe/pthreads/issues/757
+ - git checkout 6c6b15138c923b69cfa46ee05fc2dd45da587287
  - phpize
  - ./configure
  - make

src/pocketmine/command/SimpleCommandMap.php

@@ -85,48 +85,52 @@ class SimpleCommandMap implements CommandMap{
 	}
 
 	private function setDefaultCommands(){
-		$this->register("pocketmine", new VersionCommand("version"));
+		$this->registerAll("pocketmine", [
-		$this->register("pocketmine", new PluginsCommand("plugins"));
+			new BanCommand("ban"),
-		$this->register("pocketmine", new SeedCommand("seed"));
+			new BanIpCommand("ban-ip"),
-		$this->register("pocketmine", new HelpCommand("help"));
+			new BanListCommand("banlist"),
-		$this->register("pocketmine", new StopCommand("stop"));
+			new DefaultGamemodeCommand("defaultgamemode"),
-		$this->register("pocketmine", new TellCommand("tell"));
+			new DeopCommand("deop"),
-		$this->register("pocketmine", new DefaultGamemodeCommand("defaultgamemode"));
+			new DifficultyCommand("difficulty"),
-		$this->register("pocketmine", new BanCommand("ban"));
+			new EffectCommand("effect"),
-		$this->register("pocketmine", new BanIpCommand("ban-ip"));
+			new EnchantCommand("enchant"),
-		$this->register("pocketmine", new BanListCommand("banlist"));
+			new GamemodeCommand("gamemode"),
-		$this->register("pocketmine", new PardonCommand("pardon"));
+			new GiveCommand("give"),
-		$this->register("pocketmine", new PardonIpCommand("pardon-ip"));
+			new HelpCommand("help"),
-		$this->register("pocketmine", new SayCommand("say"));
+			new KickCommand("kick"),
-		$this->register("pocketmine", new MeCommand("me"));
+			new KillCommand("kill"),
-		$this->register("pocketmine", new ListCommand("list"));
+			new ListCommand("list"),
-		$this->register("pocketmine", new DifficultyCommand("difficulty"));
+			new MeCommand("me"),
-		$this->register("pocketmine", new KickCommand("kick"));
+			new OpCommand("op"),
-		$this->register("pocketmine", new OpCommand("op"));
+			new PardonCommand("pardon"),
-		$this->register("pocketmine", new DeopCommand("deop"));
+			new PardonIpCommand("pardon-ip"),
-		$this->register("pocketmine", new WhitelistCommand("whitelist"));
+			new ParticleCommand("particle"),
-		$this->register("pocketmine", new SaveOnCommand("save-on"));
+			new PluginsCommand("plugins"),
-		$this->register("pocketmine", new SaveOffCommand("save-off"));
+			new ReloadCommand("reload"),
-		$this->register("pocketmine", new SaveCommand("save-all"));
+			new SaveCommand("save-all"),
-		$this->register("pocketmine", new GiveCommand("give"));
+			new SaveOffCommand("save-off"),
-		$this->register("pocketmine", new EffectCommand("effect"));
+			new SaveOnCommand("save-on"),
-		$this->register("pocketmine", new EnchantCommand("enchant"));
+			new SayCommand("say"),
-		$this->register("pocketmine", new ParticleCommand("particle"));
+			new SeedCommand("seed"),
-		$this->register("pocketmine", new GamemodeCommand("gamemode"));
+			new SetWorldSpawnCommand("setworldspawn"),
-		$this->register("pocketmine", new KillCommand("kill"));
+			new SpawnpointCommand("spawnpoint"),
-		$this->register("pocketmine", new SpawnpointCommand("spawnpoint"));
+			new StopCommand("stop"),
-		$this->register("pocketmine", new SetWorldSpawnCommand("setworldspawn"));
+			new TeleportCommand("tp"),
-		$this->register("pocketmine", new TeleportCommand("tp"));
+			new TellCommand("tell"),
-		$this->register("pocketmine", new TimeCommand("time"));
+			new TimeCommand("time"),
-		$this->register("pocketmine", new TimingsCommand("timings"));
+			new TimingsCommand("timings"),
-		$this->register("pocketmine", new TitleCommand("title"));
+			new TitleCommand("title"),
-		$this->register("pocketmine", new ReloadCommand("reload"));
+			new TransferServerCommand("transferserver"),
-		$this->register("pocketmine", new TransferServerCommand("transferserver"));
+			new VersionCommand("version"),
+			new WhitelistCommand("whitelist")
+		]);
 
 		if($this->server->getProperty("debug.commands", false)){
-			$this->register("pocketmine", new StatusCommand("status"));
+			$this->registerAll("pocketmine", [
-			$this->register("pocketmine", new GarbageCollectorCommand("gc"));
+				new StatusCommand("status"),
-			$this->register("pocketmine", new DumpMemoryCommand("dumpmemory"));
+				new GarbageCollectorCommand("gc"),
+				new DumpMemoryCommand("dumpmemory")
+			]);
 		}
 	}
 

src/pocketmine/entity/FallingSand.php

@@ -26,7 +26,6 @@ namespace pocketmine\entity;
 use pocketmine\block\BlockFactory;
 use pocketmine\event\entity\EntityBlockChangeEvent;
 use pocketmine\event\entity\EntityDamageEvent;
-use pocketmine\item\Item as ItemItem;
 use pocketmine\item\ItemFactory;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\ByteTag;

src/pocketmine/event/server/NetworkInterfaceRegisterEvent.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
-use pocketmine\network\SourceInterface;
 
 /**
  * Called when a network interface is registered into the network, for example the RakLib interface.

src/pocketmine/plugin/PluginDescription.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\plugin;
 
-use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\permission\Permission;
 
 class PluginDescription{