mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-26 04:43:45 +00:00
Code Issues Projects Releases Wiki Activity

Refactor some variable names in Vine

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-10-11 20:12:12 +01:00
parent d8b1757ebc
commit 6569fdbe04
1 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/pocketmine/block/Vine.php
View File

@ -77,61 +77,63 @@ class Vine extends Transparent{
protected function recalculateBoundingBox() : ?AxisAlignedBB{ protected function recalculateBoundingBox() : ?AxisAlignedBB{
$f1 = 1; $minX = 1;
$f2 = 1; $minY = 1;
$f3 = 1; $minZ = 1;
$f4 = 0; $maxX = 0;
$f5 = 0; $maxY = 0;
$f6 = 0; $maxZ = 0;
$flag = $this->meta > 0; $flag = $this->meta > 0;
if(($this->meta & self::FLAG_WEST) > 0){ if(($this->meta & self::FLAG_WEST) > 0){
$f4 = max($f4, 0.0625); $maxX = max($maxX, 0.0625);
$f1 = 0; $minX = 0;
$f2 = 0; $minY = 0;
$f5 = 1; $maxY = 1;
$f3 = 0; $minZ = 0;
$f6 = 1; $maxZ = 1;
$flag = true; $flag = true;
} }
if(($this->meta & self::FLAG_EAST) > 0){ if(($this->meta & self::FLAG_EAST) > 0){
$f1 = min($f1, 0.9375); $minX = min($minX, 0.9375);
$f4 = 1; $maxX = 1;
$f2 = 0; $minY = 0;
$f5 = 1; $maxY = 1;
$f3 = 0; $minZ = 0;
$f6 = 1; $maxZ = 1;
$flag = true; $flag = true;
} }
if(($this->meta & self::FLAG_SOUTH) > 0){ if(($this->meta & self::FLAG_SOUTH) > 0){
$f3 = min($f3, 0.9375); $minZ = min($minZ, 0.9375);
$f6 = 1; $maxZ = 1;
$f1 = 0; $minX = 0;
$f4 = 1; $maxX = 1;
$f2 = 0; $minY = 0;
$f5 = 1; $maxY = 1;
$flag = true; $flag = true;
} }
//TODO: Missing NORTH check
if(!$flag and $this->getSide(Vector3::SIDE_UP)->isSolid()){ if(!$flag and $this->getSide(Vector3::SIDE_UP)->isSolid()){
$f2 = min($f2, 0.9375); $minY = min($minY, 0.9375);
$f5 = 1; $maxY = 1;
$f1 = 0; $minX = 0;
$f4 = 1; $maxX = 1;
$f3 = 0; $minZ = 0;
$f6 = 1; $maxZ = 1;
} }
return new AxisAlignedBB( return new AxisAlignedBB(
$this->x + $f1, $this->x + $minX,
$this->y + $f2, $this->y + $minY,
$this->z + $f3, $this->z + $minZ,
$this->x + $f4, $this->x + $maxX,
$this->y + $f5, $this->y + $maxY,
$this->z + $f6 $this->z + $maxZ
); );
} }