Merge branch 'stable' into next-minor

src/PocketMine.php

@@ -213,6 +213,8 @@ JIT_WARNING
 			}
 			critical_error("PHP binary used: " . $binary);
 			critical_error("Loaded php.ini: " . (($file = php_ini_loaded_file()) !== false ? $file : "none"));
+			$phprc = getenv("PHPRC");
+			critical_error("Value of PHPRC environment variable: " . ($phprc === false ? "" : $phprc));
 			critical_error("Please recompile PHP with the needed configuration, or refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
 			echo PHP_EOL;
 			exit(1);

src/command/SimpleCommandMap.php

@@ -206,7 +206,7 @@ class SimpleCommandMap implements CommandMap{
 		foreach($matches[0] as $k => $_){
 			for($i = 1; $i <= 2; ++$i){
 				if($matches[$i][$k] !== ""){
-					$args[$k] = stripslashes($matches[$i][$k]);
+					$args[$k] = $i === 1 ? stripslashes($matches[$i][$k]) : $matches[$i][$k];
 					break;
 				}
 			}

src/entity/ExperienceManager.php

@@ -27,7 +27,6 @@ use pocketmine\entity\utils\ExperienceUtils;
 use pocketmine\event\player\PlayerExperienceChangeEvent;
 use pocketmine\item\Durable;
 use pocketmine\item\enchantment\VanillaEnchantments;
-use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Limits;
 use pocketmine\world\sound\XpCollectSound;
 use pocketmine\world\sound\XpLevelUpSound;
@@ -36,7 +35,6 @@ use function ceil;
 use function count;
 use function max;
 use function min;
-use function sprintf;
 
 class ExperienceManager{
 
@@ -146,9 +144,6 @@ class ExperienceManager{
 
 		$xpLevel = (int) $newLevel;
 		$xpProgress = $newLevel - (int) $newLevel;
-		if($xpProgress > 1.0){
-			throw new AssumptionFailedError(sprintf("newLevel - (int) newLevel should never be bigger than 1, but have %.53f (newLevel=%.53f)", $xpProgress, $newLevel));
-		}
 		return $this->setXpAndProgress($xpLevel, $xpProgress);
 	}
 

src/entity/object/ItemEntity.php

@@ -71,7 +71,7 @@ class ItemEntity extends Entity{
 		if($item->isNull()){
 			throw new \InvalidArgumentException("Item entity must have a non-air item with a count of at least 1");
 		}
-		$this->item = $item;
+		$this->item = clone $item;
 		parent::__construct($location, $nbt);
 	}
 

src/event/player/PlayerExperienceChangeEvent.php

@@ -82,6 +82,9 @@ class PlayerExperienceChangeEvent extends EntityEvent implements Cancellable{
 	}
 
 	public function setNewProgress(?float $newProgress) : void{
+		if($newProgress < 0.0 || $newProgress > 1.0){
+			throw new \InvalidArgumentException("XP progress must be in range 0-1");
+		}
 		$this->newProgress = $newProgress;
 	}
 }

src/item/WritableBookBase.php

@@ -31,6 +31,7 @@ use function array_push;
 use function array_slice;
 use function array_values;
 use function count;
+use function mb_scrub;
 
 abstract class WritableBookBase extends Item{
 	public const TAG_PAGES = "pages"; //TAG_List<TAG_Compound>
@@ -168,12 +169,12 @@ abstract class WritableBookBase extends Item{
 			if($pages->getTagType() === NBT::TAG_Compound){ //PE format
 				/** @var CompoundTag $page */
 				foreach($pages as $page){
-					$this->pages[] = new WritableBookPage($page->getString(self::TAG_PAGE_TEXT), $page->getString(self::TAG_PAGE_PHOTONAME, ""));
+					$this->pages[] = new WritableBookPage(mb_scrub($page->getString(self::TAG_PAGE_TEXT), 'UTF-8'), $page->getString(self::TAG_PAGE_PHOTONAME, ""));
 				}
 			}elseif($pages->getTagType() === NBT::TAG_String){ //PC format
 				/** @var StringTag $page */
 				foreach($pages as $page){
-					$this->pages[] = new WritableBookPage($page->getValue());
+					$this->pages[] = new WritableBookPage(mb_scrub($page->getValue(), 'UTF-8'));
 				}
 			}
 		}

src/plugin/PluginDescription.php

@@ -28,6 +28,7 @@ use pocketmine\permission\PermissionParser;
 use pocketmine\permission\PermissionParserException;
 use function array_map;
 use function array_values;
+use function get_debug_type;
 use function is_array;
 use function is_string;
 use function preg_match;
@@ -85,7 +86,18 @@ class PluginDescription{
 	 * @param string|mixed[] $yamlString
 	 */
 	public function __construct($yamlString){
-		$this->loadMap(!is_array($yamlString) ? yaml_parse($yamlString) : $yamlString);
+		if(is_string($yamlString)){
+			$map = yaml_parse($yamlString);
+			if($map === false){
+				throw new PluginDescriptionParseException("YAML parsing error in plugin manifest");
+			}
+			if(!is_array($map)){
+				throw new PluginDescriptionParseException("Invalid structure of plugin manifest, expected array but have " . get_debug_type($map));
+			}
+		}else{
+			$map = $yamlString;
+		}
+		$this->loadMap($map);
 	}
 
 	/**

src/updater/UpdateChecker.php

@@ -153,6 +153,8 @@ class UpdateChecker{
 
 		if($currentVersion->getBuild() > 0 && $currentVersion->compare($newVersion) > 0){
 			$this->updateInfo = $updateInfo;
+		}else{
+			$this->logger->debug("API reported version is an older version or the same version (" . $newVersion->getFullVersion() . "), not showing notification");
 		}
 	}
 
@@ -160,12 +162,7 @@ class UpdateChecker{
 	 * Returns the channel used for update checking (stable, beta, dev)
 	 */
 	public function getChannel() : string{
-		$channel = strtolower($this->server->getConfigGroup()->getPropertyString("auto-updater.preferred-channel", "stable"));
-		if($channel !== "stable" and $channel !== "beta" and $channel !== "alpha" and $channel !== "development"){
-			$channel = "stable";
-		}
-
-		return $channel;
+		return strtolower($this->server->getConfigGroup()->getPropertyString("auto-updater.preferred-channel", "stable"));
 	}
 
 	/**