diff --git a/src/pocketmine/block/Crops.php b/src/pocketmine/block/Crops.php index e4bd5d2cf..42f1bcbf2 100644 --- a/src/pocketmine/block/Crops.php +++ b/src/pocketmine/block/Crops.php @@ -72,7 +72,7 @@ abstract class Crops extends Flowable{ $this->getLevel()->setBlock($this, $ev->getNewState()); } - $item->count--; + $item->pop(); return true; } diff --git a/src/pocketmine/block/Grass.php b/src/pocketmine/block/Grass.php index fd1f47b9e..b640de854 100644 --- a/src/pocketmine/block/Grass.php +++ b/src/pocketmine/block/Grass.php @@ -98,7 +98,7 @@ class Grass extends Solid{ public function onActivate(Item $item, Player $player = null) : bool{ if($item->getId() === Item::DYE and $item->getDamage() === 0x0F){ - $item->count--; + $item->pop(); TallGrassObject::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2); return true; diff --git a/src/pocketmine/block/Sapling.php b/src/pocketmine/block/Sapling.php index 73e315ab6..e8db5dd75 100644 --- a/src/pocketmine/block/Sapling.php +++ b/src/pocketmine/block/Sapling.php @@ -61,7 +61,7 @@ class Sapling extends Flowable{ //TODO: change log type Tree::growTree($this->getLevel(), $this->x, $this->y, $this->z, new Random(mt_rand()), $this->getVariant()); - $item->count--; + $item->pop(); return true; } diff --git a/src/pocketmine/block/Sugarcane.php b/src/pocketmine/block/Sugarcane.php index a75023f2d..4dc97d84d 100644 --- a/src/pocketmine/block/Sugarcane.php +++ b/src/pocketmine/block/Sugarcane.php @@ -76,7 +76,7 @@ class Sugarcane extends Flowable{ $this->getLevel()->setBlock($this, $this); } - $item->count--; + $item->pop(); return true; } diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php index 2440bf97e..562fe2675 100644 --- a/src/pocketmine/item/Item.php +++ b/src/pocketmine/item/Item.php @@ -180,7 +180,7 @@ class Item implements ItemIds, \JsonSerializable{ /** @var CompoundTag|null */ private $cachedNBT = null; /** @var int */ - public $count = 1; + protected $count = 1; /** @var string */ protected $name; diff --git a/src/pocketmine/item/PaintingItem.php b/src/pocketmine/item/PaintingItem.php index 0ee2542fe..1c7085b41 100644 --- a/src/pocketmine/item/PaintingItem.php +++ b/src/pocketmine/item/PaintingItem.php @@ -93,7 +93,7 @@ class PaintingItem extends Item{ $entity = Entity::createEntity("Painting", $blockReplace->getLevel(), $nbt); if($entity instanceof Entity){ - --$this->count; + $this->pop(); $entity->spawnToAll(); $player->getLevel()->broadcastLevelEvent($blockReplace->add(0.5, 0.5, 0.5), LevelEventPacket::EVENT_SOUND_ITEMFRAME_PLACE); //item frame and painting have the same sound diff --git a/src/pocketmine/item/ProjectileItem.php b/src/pocketmine/item/ProjectileItem.php index e06cd398e..db9b16ca7 100644 --- a/src/pocketmine/item/ProjectileItem.php +++ b/src/pocketmine/item/ProjectileItem.php @@ -55,7 +55,7 @@ abstract class ProjectileItem extends Item{ $projectile->setMotion($projectile->getMotion()->multiply($this->getThrowForce())); } - $this->count--; + $this->pop(); if($projectile instanceof Projectile){ $projectileEv = new ProjectileLaunchEvent($projectile); diff --git a/src/pocketmine/item/SpawnEgg.php b/src/pocketmine/item/SpawnEgg.php index 4eca401f9..1c2be92a5 100644 --- a/src/pocketmine/item/SpawnEgg.php +++ b/src/pocketmine/item/SpawnEgg.php @@ -40,7 +40,7 @@ class SpawnEgg extends Item{ $entity = Entity::createEntity($this->meta, $player->getLevel(), $nbt); if($entity instanceof Entity){ - --$this->count; + $this->pop(); $entity->spawnToAll(); return true; }