mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-29 14:15:47 +00:00
Code Issues Projects Releases Wiki Activity

Liquid: improve minimum cost calculation handling

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-09-18 15:52:16 +01:00
parent 1b5071e074
commit b047100719
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/block/Liquid.php
View File

@ -29,6 +29,7 @@ use pocketmine\event\block\BlockFormEvent;
use pocketmine\event\block\BlockSpreadEvent; use pocketmine\event\block\BlockSpreadEvent;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\world\sound\FizzSound; use pocketmine\world\sound\FizzSound;
use pocketmine\world\sound\Sound; use pocketmine\world\sound\Sound;
@ -326,22 +327,8 @@ abstract class Liquid extends Transparent{
} }
if($adjacentDecay < 8){ if($adjacentDecay < 8){
$flags = $this->getOptimalFlowDirections(); foreach($this->getOptimalFlowDirections() as $facing){
$this->flowIntoBlock($world->getBlock($this->position->getSide($facing)), $adjacentDecay, false);
if($flags[0]){
$this->flowIntoBlock($world->getBlockAt($this->position->x - 1, $this->position->y, $this->position->z), $adjacentDecay, false);
}
if($flags[1]){
$this->flowIntoBlock($world->getBlockAt($this->position->x + 1, $this->position->y, $this->position->z), $adjacentDecay, false);
}
if($flags[2]){
$this->flowIntoBlock($world->getBlockAt($this->position->x, $this->position->y, $this->position->z - 1), $adjacentDecay, false);
}
if($flags[3]){
$this->flowIntoBlock($world->getBlockAt($this->position->x, $this->position->y, $this->position->z + 1), $adjacentDecay, false);
} }
} }
} }
@ -371,7 +358,7 @@ abstract class Liquid extends Transparent{
$cost = 1000; $cost = 1000;
$world = $this->position->getWorld(); $world = $this->position->getWorld();
for($j = 0; $j < 4; ++$j){ foreach(Facing::HORIZONTAL as $j){
if($j === $originOpposite or $j === $lastOpposite){ if($j === $originOpposite or $j === $lastOpposite){
continue; continue;
} }
@ -380,13 +367,13 @@ abstract class Liquid extends Transparent{
$y = $blockY; $y = $blockY;
$z = $blockZ; $z = $blockZ;
if($j === 0){ if($j === Facing::WEST){
--$x; --$x;
}elseif($j === 1){ }elseif($j === Facing::EAST){
++$x; ++$x;
}elseif($j === 2){ }elseif($j === Facing::NORTH){
--$z; --$z;
}elseif($j === 3){ }elseif($j === Facing::SOUTH){
++$z; ++$z;
} }
@ -413,7 +400,7 @@ abstract class Liquid extends Transparent{
continue; continue;
} }
$realCost = $this->calculateFlowCost($x, $y, $z, $accumulatedCost + 1, $maxCost, $originOpposite, $j ^ 0x01); $realCost = $this->calculateFlowCost($x, $y, $z, $accumulatedCost + 1, $maxCost, $originOpposite, Facing::opposite($j));
if($realCost < $cost){ if($realCost < $cost){
$cost = $realCost; $cost = $realCost;
@ -424,24 +411,24 @@ abstract class Liquid extends Transparent{
} }
/** /**
* @return bool[] * @return int[]
*/ */
private function getOptimalFlowDirections() : array{ private function getOptimalFlowDirections() : array{
$world = $this->position->getWorld(); $world = $this->position->getWorld();
$flowCost = array_fill(0, 4, 1000); $flowCost = array_fill(0, 4, 1000);
$maxCost = intdiv(4, $this->getFlowDecayPerBlock()); $maxCost = intdiv(4, $this->getFlowDecayPerBlock());
for($j = 0; $j < 4; ++$j){ foreach(Facing::HORIZONTAL as $j){
$x = $this->position->x; $x = $this->position->x;
$y = $this->position->y; $y = $this->position->y;
$z = $this->position->z; $z = $this->position->z;
if($j === 0){ if($j === Facing::WEST){
--$x; --$x;
}elseif($j === 1){ }elseif($j === Facing::EAST){
++$x; ++$x;
}elseif($j === 2){ }elseif($j === Facing::NORTH){
--$z; --$z;
}elseif($j === 3){ }elseif($j === Facing::SOUTH){
++$z; ++$z;
} }
$block = $world->getBlockAt($x, $y, $z); $block = $world->getBlockAt($x, $y, $z);
@ -453,7 +440,8 @@ abstract class Liquid extends Transparent{
$flowCost[$j] = $maxCost = 0; $flowCost[$j] = $maxCost = 0;
}elseif($maxCost > 0){ }elseif($maxCost > 0){
$this->flowCostVisited[World::blockHash($x, $y, $z)] = self::CAN_FLOW; $this->flowCostVisited[World::blockHash($x, $y, $z)] = self::CAN_FLOW;
$flowCost[$j] = $this->calculateFlowCost($x, $y, $z, 1, $maxCost, $j ^ 0x01, $j ^ 0x01); $opposite = Facing::opposite($j);
$flowCost[$j] = $this->calculateFlowCost($x, $y, $z, 1, $maxCost, $opposite, $opposite);
$maxCost = min($maxCost, $flowCost[$j]); $maxCost = min($maxCost, $flowCost[$j]);
} }
} }
@ -464,8 +452,10 @@ abstract class Liquid extends Transparent{
$isOptimalFlowDirection = []; $isOptimalFlowDirection = [];
for($i = 0; $i < 4; ++$i){ foreach($flowCost as $facing => $cost){
$isOptimalFlowDirection[$i] = ($flowCost[$i] === $minCost); if($cost === $minCost){
$isOptimalFlowDirection[] = $facing;
}
} }
return $isOptimalFlowDirection; return $isOptimalFlowDirection;