mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-28 06:09:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '89521f166d8b43f2fd2af99f367888a34b44c492'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/world/Explosion.php
This commit is contained in:
Dylan K. Taylor 2020-06-26 18:42:30 +01:00
commit 17054e1001
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/world/Explosion.php
View File

@ -132,10 +132,12 @@ class Explosion{
if($state !== 0){ if($state !== 0){
$blastForce -= ($blockFactory->blastResistance[$state] / 5 + 0.3) * $this->stepLen; $blastForce -= ($blockFactory->blastResistance[$state] / 5 + 0.3) * $this->stepLen;
if($blastForce > 0){ if($blastForce > 0){
if(!isset($this->affectedBlocks[$index = World::blockHash($vBlockX, $vBlockY, $vBlockZ)])){ if(!isset($this->affectedBlocks[World::blockHash($vBlockX, $vBlockY, $vBlockZ)])){
$_block = $blockFactory->fromFullBlock($state); $_block = $blockFactory->fromFullBlock($state);
$_block->position($this->world, $vBlockX, $vBlockY, $vBlockZ); foreach($_block->getAffectedBlocks() as $_affectedBlock){
$this->affectedBlocks[$index] = $_block; $_affectedBlockPos = $_affectedBlock->getPos();
$this->affectedBlocks[World::blockHash($_affectedBlockPos->x, $_affectedBlockPos->y, $_affectedBlockPos->z)] = $_affectedBlock;
}
} }
} }
} }