mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-18 12:04:46 +00:00
Code Issues Projects Releases Wiki Activity

LegacyStringToItemParser: rely exclusively on item_from_string_bc_map.json, do not interpret integers given as strings

Browse Source 
fixes #4507
This commit is contained in:
Dylan K. Taylor
2021-10-13 20:29:18 +01:00
parent 6284cd14c7
commit b570324288
2 changed files with 690 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/item/LegacyStringToItemParser.php
View File

@@ -63,8 +63,8 @@ final class LegacyStringToItemParser{
if(!is_array($mappings)) throw new AssumptionFailedError("Invalid mappings format, expected array");
foreach($mappings as $name => $id){
if(!is_string($name) or !is_int($id)) throw new AssumptionFailedError("Invalid mappings format, expected string keys and int values");
$result->addMapping($name, $id);
if(!is_int($id)) throw new AssumptionFailedError("Invalid mappings format, expected int values");
$result->addMapping((string) $name, $id);
}
return $result;
@@ -114,9 +114,7 @@ final class LegacyStringToItemParser{
throw new LegacyStringToItemParserException("Unable to parse \"" . $b[1] . "\" from \"" . $input . "\" as a valid meta value");
}
if(is_numeric($b[0])){
$item = $this->itemFactory->get((int) $b[0], $meta);
}elseif(isset($this->map[strtolower($b[0])])){
if(isset($this->map[strtolower($b[0])])){
$item = $this->itemFactory->get($this->map[strtolower($b[0])], $meta);
}else{
throw new LegacyStringToItemParserException("Unable to resolve \"" . $input . "\" to a valid item");