decreased block updates per chunk from 80 to 20, PMFLevel block methods should be a bit faster now, grass spread rework, leaf decay fix

This commit is contained in:
GameHerobrine 2023-06-23 20:52:50 +03:00
parent 3dd9e38a37
commit 4544b7bb63
9 changed files with 73 additions and 60 deletions

View file

@ -203,9 +203,7 @@ class PMFLevel extends PMF{
}
public function getIndex($X, $Z){
$X = (int) $X;
$Z = (int) $Z;
return ($Z << $this->log) + $X;
return ((int) $Z << 4) + (int) $X; //statically 4, setting it to something else would destroy everything
}
public function saveChunk($X, $Z){
@ -333,15 +331,14 @@ class PMFLevel extends PMF{
$Z = $z >> 4;
$Y = $y >> 4;
$index = $this->getIndex($X, $Z);
if(!isset($this->chunks[$index]) || $this->chunks[$index] === false || ($this->chunks[$index][$Y] === false)){
return 0;
}
$aX = $x & 0xf;
$aZ = $z & 0xf;
$aY = $y & 0xf;
if(is_array($this->chunks) && isset($this->chunks[$index]) && is_array($this->chunks[$index]) && isset($this->chunks[$index][$Y]) && is_string($this->chunks[$index][$Y])){
$b = ord($this->chunks[$index][$Y][($aY + ($aX << 5) + ($aZ << 9))]);
}else{ //php8 fix
$b = 0;
}
$b = ord($this->chunks[$index][$Y][($aY + ($aX << 5) + ($aZ << 9))]);
return $b;
}
@ -379,21 +376,14 @@ class PMFLevel extends PMF{
$Z = $z >> 4;
$Y = $y >> 4;
$index = $this->getIndex($X, $Z);
if(!isset($this->chunks[$index]) || $this->chunks[$index] === false || ($this->chunks[$index][$Y] === false)){
return 0;
}
$aX = $x & 0xf;
$aZ = $z & 0xf;
$aY = $y & 0xf;
if(is_array($this->chunks) && isset($this->chunks[$index]) && is_array($this->chunks[$index]) && isset($this->chunks[$index][$Y]) && is_string($this->chunks[$index][$Y])){
$m = ord($this->chunks[$index][$Y][(int) (($aY >> 1) + 16 + ($aX << 5) + ($aZ << 9))]);
}else{ //php8 fix
$m = 0;
}
if(($y & 1) === 0){
$m = $m & 0x0F;
}else{
$m = $m >> 4;
}
return $m;
$m = ord($this->chunks[$index][$Y][(int) (($aY >> 1) + 16 + ($aX << 5) + ($aZ << 9))]);
return ($y & 1) === 0 ? $m & 0x0F : $m >> 4;
}
public function setBlockDamage($x, $y, $z, $damage){
@ -439,25 +429,24 @@ class PMFLevel extends PMF{
if($x < 0 || $x > 255 || $z < 0 || $z > 255 || $y < 0 || $y > 127){
return [AIR, 0];
}
$index = $this->getIndex($X, $Z);
if(!isset($this->chunks[$index]) or $this->chunks[$index] === false){
if(!isset($this->chunks[$index]) || $this->chunks[$index] === false){
if($this->loadChunk($X, $Z) === false){
return [AIR, 0];
}
}elseif($this->chunks[$index][$Y] === false){
}
if($this->chunks[$index][$Y] === false){
return [AIR, 0];
}
$aX = $x & 0xf;
$aZ = $z & 0xf;
$aY = $y & 0xf;
#Need to fix. But idk how.
if(is_array($this->chunks) && is_array($this->chunks[$index]) && is_string($this->chunks[$index][$Y])){ //PHP8 warn fix
$b = ord($this->chunks[$index][$Y][($aY + ($aX << 5) + ($aZ << 9))]);
$m = ord($this->chunks[$index][$Y][(($aY >> 1) + 16 + ($aX << 5) + ($aZ << 9))]);
}else{
$b = 0;
$m = 0;
}
//if(is_string($this->chunks[$index][$Y])){ //PHP8 warn fix
$b = ord($this->chunks[$index][$Y][($aY + ($aX << 5) + ($aZ << 9))]);
$m = ord($this->chunks[$index][$Y][(($aY >> 1) + 16 + ($aX << 5) + ($aZ << 9))]);
if(($y & 1) === 0){
$m = $m & 0x0F;