mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
fixed broken findLog cache, fixed dyes with meta > 15
This commit is contained in:
parent
82b188168b
commit
69d3321e16
2 changed files with 35 additions and 30 deletions
|
|
@ -22,28 +22,30 @@ class LeavesBlock extends TransparentBlock{
|
|||
}
|
||||
|
||||
public static function createIndex($x, $y, $z){
|
||||
return $x.".".$y.".".$z;
|
||||
return "$x.$y.$z";
|
||||
}
|
||||
public static function findLog(Level $level, $x, $y, $z, array $visited, $distance){ //port from newest pocketmine
|
||||
public static function findLog(Level $level, $x, $y, $z, array &$visited, $distance){ //port from newest pocketmine
|
||||
$index = self::createIndex($x, $y, $z);
|
||||
if(isset($visited[$index])){
|
||||
return false;
|
||||
return $visited[$index];
|
||||
}
|
||||
$visited[$index] = true;
|
||||
|
||||
|
||||
$block = $level->level->getBlockID($x, $y, $z);
|
||||
if($block === WOOD){ //type doesn't matter
|
||||
return true;
|
||||
return ($visited[$index] = true);
|
||||
}
|
||||
|
||||
if($block === LEAVES && $distance <= 4){
|
||||
if(self::findLog($level, $x - 1, $y, $z, $visited, $distance + 1)) return true;
|
||||
if(self::findLog($level, $x + 1, $y, $z, $visited, $distance + 1)) return true;
|
||||
if(self::findLog($level, $x, $y, $z - 1, $visited, $distance + 1)) return true;
|
||||
if(self::findLog($level, $x, $y, $z + 1, $visited, $distance + 1)) return true;
|
||||
if(self::findLog($level, $x - 1, $y, $z, $visited, $distance + 1)) return ($visited[$index] = true);
|
||||
if(self::findLog($level, $x + 1, $y, $z, $visited, $distance + 1)) return ($visited[$index] = true);
|
||||
if(self::findLog($level, $x, $y, $z - 1, $visited, $distance + 1)) return ($visited[$index] = true);
|
||||
if(self::findLog($level, $x, $y, $z + 1, $visited, $distance + 1)) return ($visited[$index] = true);
|
||||
}
|
||||
return false;
|
||||
|
||||
return ($visited[$index] = false);
|
||||
}
|
||||
|
||||
public static function onRandomTick(Level $level, $x, $y, $z){
|
||||
$b = $level->level->getBlock($x, $y, $z);
|
||||
$id = $b[0];
|
||||
|
|
|
|||
|
|
@ -1,26 +1,29 @@
|
|||
<?php
|
||||
|
||||
class DyeItem extends Item{
|
||||
|
||||
public static $names = array(
|
||||
0 => "Ink Sac",
|
||||
1 => "Rose Red",
|
||||
2 => "Cactus Green",
|
||||
3 => "Cocoa Beans",
|
||||
4 => "Lapis Lazuli",
|
||||
5 => "Purple Dye",
|
||||
6 => "Cyan Dye",
|
||||
7 => "Light Gray Dye",
|
||||
8 => "Gray Dye",
|
||||
9 => "Pink Dye",
|
||||
10 => "Lime Dye",
|
||||
11 => "Dandelion Yellow",
|
||||
12 => "Light Blue Dye",
|
||||
13 => "Magenta Dye",
|
||||
14 => "Orange Dye",
|
||||
15 => "Bone Meal",
|
||||
);
|
||||
|
||||
public function __construct($meta = 0, $count = 1){
|
||||
parent::__construct(DYE, $meta, $count, "Dye");
|
||||
$names = array(
|
||||
0 => "Ink Sac",
|
||||
1 => "Rose Red",
|
||||
2 => "Cactus Green",
|
||||
3 => "Cocoa Beans",
|
||||
4 => "Lapis Lazuli",
|
||||
5 => "Purple Dye",
|
||||
6 => "Cyan Dye",
|
||||
7 => "Light Gray Dye",
|
||||
8 => "Gray Dye",
|
||||
9 => "Pink Dye",
|
||||
10 => "Lime Dye",
|
||||
11 => "Dandelion Yellow",
|
||||
12 => "Light Blue Dye",
|
||||
13 => "Magenta Dye",
|
||||
14 => "Orange Dye",
|
||||
15 => "Bone Meal",
|
||||
);
|
||||
$this->name = $names[$this->meta];
|
||||
parent::__construct(DYE, $meta & 0xf, $count, "Dye");
|
||||
|
||||
$this->name = self::$names[$this->meta];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue