diff --git a/src/pocketmine/block/Air.php b/src/pocketmine/block/Air.php index a58ad31a38..4ade171fc0 100644 --- a/src/pocketmine/block/Air.php +++ b/src/pocketmine/block/Air.php @@ -74,7 +74,7 @@ class Air extends Transparent{ return -1; } - public function getResistance() : float{ + public function getBlastResistance() : float{ return 0; } diff --git a/src/pocketmine/block/Anvil.php b/src/pocketmine/block/Anvil.php index 65243d59d5..0ed31ca764 100644 --- a/src/pocketmine/block/Anvil.php +++ b/src/pocketmine/block/Anvil.php @@ -49,7 +49,7 @@ class Anvil extends Fallable{ return 5; } - public function getResistance() : float{ + public function getBlastResistance() : float{ return 6000; } diff --git a/src/pocketmine/block/Bedrock.php b/src/pocketmine/block/Bedrock.php index aa3d21ef17..de108cf9f3 100644 --- a/src/pocketmine/block/Bedrock.php +++ b/src/pocketmine/block/Bedrock.php @@ -41,7 +41,7 @@ class Bedrock extends Solid{ return -1; } - public function getResistance() : float{ + public function getBlastResistance() : float{ return 18000000; } diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php index 526099b2ed..197b3a29c0 100644 --- a/src/pocketmine/block/Block.php +++ b/src/pocketmine/block/Block.php @@ -531,6 +531,7 @@ class Block extends Position implements BlockIds, Metadatable{ } /** + * Returns a base value used to compute block break times. * @return float */ public function getHardness() : float{ @@ -538,9 +539,18 @@ class Block extends Position implements BlockIds, Metadatable{ } /** + * @deprecated * @return float */ public function getResistance() : float{ + return $this->getBlastResistance(); + } + + /** + * Returns the block's resistance to explosions. Usually 5x hardness. + * @return float + */ + public function getBlastResistance() : float{ return $this->getHardness() * 5; } diff --git a/src/pocketmine/block/BrickStairs.php b/src/pocketmine/block/BrickStairs.php index b5669e381b..4cec98259e 100644 --- a/src/pocketmine/block/BrickStairs.php +++ b/src/pocketmine/block/BrickStairs.php @@ -37,7 +37,7 @@ class BrickStairs extends Stair{ return 2; } - public function getResistance() : float{ + public function getBlastResistance() : float{ return 30; } diff --git a/src/pocketmine/block/Bricks.php b/src/pocketmine/block/Bricks.php index 345ffb2c9c..d34141ae5c 100644 --- a/src/pocketmine/block/Bricks.php +++ b/src/pocketmine/block/Bricks.php @@ -38,7 +38,7 @@ class Bricks extends Solid{ return 2; } - public function getResistance() : float{ + public function getBlastResistance() : float{ return 30; } diff --git a/src/pocketmine/block/EnchantingTable.php b/src/pocketmine/block/EnchantingTable.php index bf69dcb626..3cbcbe36d9 100644 --- a/src/pocketmine/block/EnchantingTable.php +++ b/src/pocketmine/block/EnchantingTable.php @@ -69,7 +69,7 @@ class EnchantingTable extends Transparent{ return 5; } - public function getResistance() : float{ + public function getBlastResistance() : float{ return 6000; } diff --git a/src/pocketmine/block/EndPortalFrame.php b/src/pocketmine/block/EndPortalFrame.php index 3141929ef9..3bbe651c9d 100644 --- a/src/pocketmine/block/EndPortalFrame.php +++ b/src/pocketmine/block/EndPortalFrame.php @@ -46,7 +46,7 @@ class EndPortalFrame extends Solid{ return -1; } - public function getResistance() : float{ + public function getBlastResistance() : float{ return 18000000; } diff --git a/src/pocketmine/block/Flowable.php b/src/pocketmine/block/Flowable.php index 73d5e54885..43498eda24 100644 --- a/src/pocketmine/block/Flowable.php +++ b/src/pocketmine/block/Flowable.php @@ -33,7 +33,7 @@ abstract class Flowable extends Transparent{ return 0; } - public function getResistance() : float{ + public function getBlastResistance() : float{ return 0; } diff --git a/src/pocketmine/block/WoodenStairs.php b/src/pocketmine/block/WoodenStairs.php index c14b20a542..dcff14e123 100644 --- a/src/pocketmine/block/WoodenStairs.php +++ b/src/pocketmine/block/WoodenStairs.php @@ -32,7 +32,7 @@ class WoodenStairs extends Stair{ return 2; } - public function getResistance() : float{ + public function getBlastResistance() : float{ return 15; } diff --git a/src/pocketmine/level/Explosion.php b/src/pocketmine/level/Explosion.php index c214ae436b..85099ea414 100644 --- a/src/pocketmine/level/Explosion.php +++ b/src/pocketmine/level/Explosion.php @@ -95,7 +95,7 @@ class Explosion{ $block = $this->level->getBlock($vBlock); if($block->getId() !== 0){ - $blastForce -= ($block->getResistance() / 5 + 0.3) * $this->stepLen; + $blastForce -= ($block->getBlastResistance() / 5 + 0.3) * $this->stepLen; if($blastForce > 0){ if(!isset($this->affectedBlocks[$index = Level::blockHash($block->x, $block->y, $block->z)])){ $this->affectedBlocks[$index] = $block;