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

Merge branch '3.5' into 3.6

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-02-18 13:11:16 +00:00
commit 6b51bf4a80
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/block/TNT.php
View File

@ -25,6 +25,8 @@ namespace pocketmine\block;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\entity\projectile\Arrow; use pocketmine\entity\projectile\Arrow;
use pocketmine\item\Durable;
use pocketmine\item\enchantment\Enchantment;
use pocketmine\item\FlintSteel; use pocketmine\item\FlintSteel;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
@ -51,8 +53,10 @@ class TNT extends Solid{
} }
public function onActivate(Item $item, Player $player = null) : bool{ public function onActivate(Item $item, Player $player = null) : bool{
if($item instanceof FlintSteel){ if($item instanceof FlintSteel or $item->hasEnchantment(Enchantment::FIRE_ASPECT)){
$item->applyDamage(1); if($item instanceof Durable){
$item->applyDamage(1);
}
$this->ignite(); $this->ignite();
return true; return true;
} }