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

Item-from-string parsing no longer depends on ItemIds

Browse Source 
after this is done I'm banning the constant() function.
This commit is contained in:
Dylan K. Taylor
2020-05-13 00:17:15 +01:00
parent ec13aa659a
commit 11ef9fb0c0
9 changed files with 996 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/world/World.php
View File

@@ -49,6 +49,7 @@ use pocketmine\event\world\WorldSaveEvent;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\ItemUseResult;
use pocketmine\item\LegacyStringToItemParser;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\BlockActorDataPacket;
@@ -1449,9 +1450,9 @@ class World implements ChunkManager{
if($player->isAdventure(true) and !$ev->isCancelled()){
$canBreak = false;
$itemFactory = ItemFactory::getInstance();
$itemParser = LegacyStringToItemParser::getInstance();
foreach($item->getCanDestroy() as $v){
$entry = $itemFactory->fromString($v);
$entry = $itemParser->parse($v);
if($entry->getBlock()->isSameType($target)){
$canBreak = true;
break;
@@ -1583,9 +1584,9 @@ class World implements ChunkManager{
$ev = new BlockPlaceEvent($player, $hand, $blockReplace, $blockClicked, $item);
if($player->isAdventure(true) and !$ev->isCancelled()){
$canPlace = false;
$itemFactory = ItemFactory::getInstance();
$itemParser = LegacyStringToItemParser::getInstance();
foreach($item->getCanPlaceOn() as $v){
$entry = $itemFactory->fromString($v);
$entry = $itemParser->parse($v);
if($entry->getBlock()->isSameType($blockClicked)){
$canPlace = true;
break;