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

Branch merge

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-20 21:07:19 +01:00
parent 159b2e3d5e 2f3c77c68a
commit 1f70a7830e
112 changed files with 931 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/pocketmine/level/Explosion.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\level;
use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\block\TNT;
use pocketmine\entity\Entity;
use pocketmine\event\block\BlockUpdateEvent;
@ -32,6 +33,7 @@ use pocketmine\event\entity\EntityDamageByEntityEvent;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\entity\EntityExplodeEvent;
use pocketmine\item\Item;
use pocketmine\level\format\SubChunkInterface;
use pocketmine\level\particle\HugeExplodeSeedParticle;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Math;
@ -69,7 +71,14 @@ class Explosion{
}
$vector = new Vector3(0, 0, 0);
$vBlock = new Vector3(0, 0, 0);
$vBlock = new Position(0, 0, 0, $this->level);
$currentX = ((int) $this->source->x) >> 4;
$currentZ = ((int) $this->source->z) >> 4;
$currentChunk = $this->level->getChunk($currentX, $currentZ, true);
$currentSubY = ((int) $this->source->y) >> 4;
$currentSubChunk = $currentChunk->getSubChunk($currentSubY);
$mRays = (int) ($this->rays - 1);
for($i = 0; $i < $this->rays; ++$i){
@ -89,19 +98,37 @@ class Explosion{
$vBlock->x = $pointerX >= $x ? $x : $x - 1;
$vBlock->y = $pointerY >= $y ? $y : $y - 1;
$vBlock->z = $pointerZ >= $z ? $z : $z - 1;
if(!$this->level->isInWorld($vBlock->x, $vBlock->y, $vBlock->z)){
break;
}
$block = $this->level->getBlock($vBlock);
if($block->getId() !== 0){
$blastForce -= ($block->getResistance() / 5 + 0.3) * $this->stepLen;
if(($vBlock->x >> 4) !== $currentX or ($vBlock->z >> 4) !== $currentZ){
$currentX = $vBlock->x >> 4;
$currentZ = $vBlock->z >> 4;
$currentChunk = $this->level->getChunk($currentX, $currentZ);
if($currentChunk === null){
continue;
}
}
if(($vBlock->y >> 4) !== $currentSubY){
$currentSubY = $vBlock->y >> 4;
$currentSubChunk = $currentChunk->getSubChunk($currentSubY);
if($currentSubChunk === null){
continue;
}
}
$blockId = $currentSubChunk->getBlockId($vBlock->x & 0x0f, $vBlock->y & 0x0f, $vBlock->z & 0x0f);
if($blockId !== 0){
$blastForce -= (BlockFactory::$blastResistance[$blockId] / 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;
if(!isset($this->affectedBlocks[$index = Level::blockHash($vBlock->x, $vBlock->y, $vBlock->z)])){
$this->affectedBlocks[$index] = BlockFactory::get($blockId, $currentSubChunk->getBlockData($vBlock->x & 0x0f, $vBlock->y & 0x0f, $vBlock->z & 0x0f), $vBlock);
}
}
}
$pointerX += $vector->x;
$pointerY += $vector->y;
$pointerZ += $vector->z;
@ -183,6 +210,9 @@ class Explosion{
for($side = 0; $side <= 5; $side++){
$sideBlock = $pos->getSide($side);
if(!$this->level->isInWorld($sideBlock->x, $sideBlock->y, $sideBlock->z)){
continue;
}
if(!isset($this->affectedBlocks[$index = Level::blockHash($sideBlock->x, $sideBlock->y, $sideBlock->z)]) and !isset($updateBlocks[$index])){
$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockUpdateEvent($this->level->getBlock($sideBlock)));
if(!$ev->isCancelled()){