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

Liquid: Update legacy code with Facing::OFFSET

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-10-19 16:38:34 +01:00
parent 114f444ec3
commit f868c1d8c6
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/block/Liquid.php
View File

@ -170,16 +170,11 @@ abstract class Liquid extends Transparent{
$world = $this->position->getWorld(); $world = $this->position->getWorld();
foreach(Facing::HORIZONTAL as $j){ foreach(Facing::HORIZONTAL as $j){
$x = $this->position->x; [$dx, $dy, $dz] = Facing::OFFSET[$j];
$y = $this->position->y;
$z = $this->position->z;
match($j){ $x = $this->position->x + $dx;
Facing::WEST => --$x, $y = $this->position->y + $dy;
Facing::EAST => ++$x, $z = $this->position->z + $dz;
Facing::NORTH => --$z,
Facing::SOUTH => ++$z
};
$sideBlock = $world->getBlockAt($x, $y, $z); $sideBlock = $world->getBlockAt($x, $y, $z);
$blockDecay = $this->getEffectiveFlowDecay($sideBlock); $blockDecay = $this->getEffectiveFlowDecay($sideBlock);

29
src/block/utils/MinimumCostFlowCalculator.php
View File

@ -58,17 +58,10 @@ final class MinimumCostFlowCalculator{
if($j === $originOpposite || $j === $lastOpposite){ if($j === $originOpposite || $j === $lastOpposite){
continue; continue;
} }
[$dx, $dy, $dz] = Facing::OFFSET[$j];
$x = $blockX; $x = $blockX + $dx;
$y = $blockY; $y = $blockY + $dy;
$z = $blockZ; $z = $blockZ + $dz;
match($j){
Facing::WEST => --$x,
Facing::EAST => ++$x,
Facing::NORTH => --$z,
Facing::SOUTH => ++$z
};
if(!isset($this->flowCostVisited[$hash = World::blockHash($x, $y, $z)])){ if(!isset($this->flowCostVisited[$hash = World::blockHash($x, $y, $z)])){
if(!$this->world->isInWorld($x, $y, $z) || !$this->canFlowInto($this->world->getBlockAt($x, $y, $z))){ if(!$this->world->isInWorld($x, $y, $z) || !$this->canFlowInto($this->world->getBlockAt($x, $y, $z))){
@ -109,16 +102,10 @@ final class MinimumCostFlowCalculator{
$flowCost = array_fill_keys(Facing::HORIZONTAL, 1000); $flowCost = array_fill_keys(Facing::HORIZONTAL, 1000);
$maxCost = intdiv(4, $this->flowDecayPerBlock); $maxCost = intdiv(4, $this->flowDecayPerBlock);
foreach(Facing::HORIZONTAL as $j){ foreach(Facing::HORIZONTAL as $j){
$x = $originX; [$dx, $dy, $dz] = Facing::OFFSET[$j];
$y = $originY; $x = $originX + $dx;
$z = $originZ; $y = $originY + $dy;
$z = $originZ + $dz;
match($j){
Facing::WEST => --$x,
Facing::EAST => ++$x,
Facing::NORTH => --$z,
Facing::SOUTH => ++$z
};
if(!$this->world->isInWorld($x, $y, $z) || !$this->canFlowInto($this->world->getBlockAt($x, $y, $z))){ if(!$this->world->isInWorld($x, $y, $z) || !$this->canFlowInto($this->world->getBlockAt($x, $y, $z))){
$this->flowCostVisited[World::blockHash($x, $y, $z)] = self::BLOCKED; $this->flowCostVisited[World::blockHash($x, $y, $z)] = self::BLOCKED;