Merge remote-tracking branch 'origin/mcpe-0.12' into php7

src/pocketmine/Player.php

@@ -1691,7 +1691,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 		if($this->isCreative()){
 			$this->inventory->setHeldItemSlot(0);
 		}else{
-			$this->inventory->setHeldItemSlot(0);
+			$this->inventory->setHeldItemSlot($this->inventory->getHotbarSlotIndex(0));
 		}
 
 		$pk = new PlayStatusPacket();

src/pocketmine/event/Cancellable.php

@@ -28,5 +28,5 @@ namespace pocketmine\event;
 interface Cancellable{
 	public function isCancelled();
 
-	public function setCancelled($forceCancel = false);
+	public function setCancelled($value = true);
-}
+}

src/pocketmine/level/Level.php

@@ -872,7 +872,7 @@ class Level implements ChunkManager, Metadatable{
 			}
 
 			if(count($this->blockCache) > 2048){
-				$this->chunkCache = [];
+				$this->blockCache = [];
 			}
 
 		}
@@ -2340,7 +2340,7 @@ class Level implements ChunkManager, Metadatable{
 		$this->server->getPluginManager()->callEvent(new SpawnChangeEvent($this, $previousSpawn));
 	}
 
-	public function requestChunk($x, $z, Player $player, $order = LevelProvider::ORDER_ZXY){
+	public function requestChunk($x, $z, Player $player){
 		$index = Level::chunkHash($x, $z);
 		if(!isset($this->chunkSendQueue[$index])){
 			$this->chunkSendQueue[$index] = [];

src/pocketmine/level/sound/EndermanTeleportSound.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine\level\sound;
+
+use pocketmine\math\Vector3;
+use pocketmine\network\protocol\LevelEventPacket;
+
+class EndermanTeleportSound extends GenericSound{
+	public function __construct(Vector3 $pos){
+		parent::__construct($pos, LevelEventPacket::EVENT_SOUND_ENDERMAN_TELEPORT);
+	}
+}

src/pocketmine/network/protocol/LevelEventPacket.php

@@ -43,6 +43,7 @@ class LevelEventPacket extends DataPacket{
 	const EVENT_SOUND_BAT_FLY = 1015;
 	const EVENT_SOUND_ZOMBIE_INFECT = 1016;
 	const EVENT_SOUND_ZOMBIE_HEAL = 1017;
+	const EVENT_SOUND_ENDERMAN_TELEPORT = 1018;
 
 	const EVENT_SOUND_ANVIL_BREAK = 1020;
 	const EVENT_SOUND_ANVIL_USE = 1021;

src/pocketmine/utils/BinaryStream.php

@@ -105,14 +105,22 @@ class BinaryStream extends \stdClass{
 		$this->buffer .= Binary::writeLInt($v);
 	}
 
-	public function getShort($signed = true){
+	public function getSignedShort(){
-		return $signed ? Binary::readSignedShort($this->get(2)) : Binary::readShort($this->get(2));
+		return Binary::readSignedShort($this->get(2));
 	}
 
 	public function putShort($v){
 		$this->buffer .= Binary::writeShort($v);
 	}
 
+	public function getShort(){
+		return Binary::readShort($this->get(2));
+	}
+
+	public function putSignedShort($v){
+		$this->buffer .= Binary::writeShort($v);
+	}
+
 	public function getFloat(){
 		return Binary::readFloat($this->get(4));
 	}
@@ -188,7 +196,7 @@ class BinaryStream extends \stdClass{
 	}
 
 	public function getSlot(){
-		$id = $this->getShort(true);
+		$id = $this->getSignedShort();
 		
 		if($id <= 0){
 			return Item::get(0, 0, 0);

src/pocketmine/utils/ServerKiller.php

@@ -33,11 +33,11 @@ class ServerKiller extends Thread{
 
 	public function run(){
 		sleep($this->time);
-		echo "\nTook to long to stop, server was killed forcefully!\n";
+		echo "\nTook too long to stop, server was killed forcefully!\n";
 		@\pocketmine\kill(getmypid());
 	}
 
 	public function getThreadName(){
 		return "Server Killer";
 	}
-}
+}