mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
item meta overflow fix
This commit is contained in:
parent
c64d5eedbb
commit
659aea440d
4 changed files with 26 additions and 23 deletions
|
|
@ -2298,7 +2298,6 @@ class Player{
|
|||
|
||||
$this->checkSpawnPosition();
|
||||
$this->teleport($this->spawnPosition, false, false, true, false);
|
||||
|
||||
$pk = new MovePlayerPacket();
|
||||
$pk->eid = $this->entity->eid;
|
||||
$pk->x = $this->entity->x;
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ abstract class Block extends Position{
|
|||
|
||||
public function __construct($id, $meta = 0, $name = "Unknown"){
|
||||
$this->id = (int) $id;
|
||||
$this->meta = (int) $meta;
|
||||
$this->meta = ((int) $meta) & 0xf;
|
||||
$this->name = $name;
|
||||
$this->breakTime = 0.20;
|
||||
$this->hardness = 10;
|
||||
|
|
|
|||
|
|
@ -144,10 +144,11 @@ class Item{
|
|||
|
||||
public function __construct($id, $meta = 0, $count = 1, $name = "Unknown"){
|
||||
$this->id = (int) $id;
|
||||
$this->meta = (int) $meta;
|
||||
$this->meta = ((int) $meta) & 0xffff;
|
||||
$this->count = (int) $count;
|
||||
$this->name = $name;
|
||||
if(!isset($this->block) and $this->id <= 0xff and isset(Block::$class[$this->id])){
|
||||
if(!isset($this->block) && $this->id <= 0xff && isset(Block::$class[$this->id])){
|
||||
$this->meta &= 0xf;
|
||||
$this->block = BlockAPI::get($this->id, $this->meta);
|
||||
$this->name = $this->block->getName();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,27 +2,30 @@
|
|||
|
||||
class WoolBlock extends SolidBlock{
|
||||
public static $blockID;
|
||||
|
||||
public static $names = [
|
||||
0 => "White Wool",
|
||||
1 => "Orange Wool",
|
||||
2 => "Magenta Wool",
|
||||
3 => "Light Blue Wool",
|
||||
4 => "Yellow Wool",
|
||||
5 => "Lime Wool",
|
||||
6 => "Pink Wool",
|
||||
7 => "Gray Wool",
|
||||
8 => "Light Gray Wool",
|
||||
9 => "Cyan Wool",
|
||||
10 => "Purple Wool",
|
||||
11 => "Blue Wool",
|
||||
12 => "Brown Wool",
|
||||
13 => "Green Wool",
|
||||
14 => "Red Wool",
|
||||
15 => "Black Wool",
|
||||
];
|
||||
|
||||
public function __construct($meta = 0){
|
||||
parent::__construct(WOOL, $meta, "Wool");
|
||||
$names = array(
|
||||
0 => "White Wool",
|
||||
1 => "Orange Wool",
|
||||
2 => "Magenta Wool",
|
||||
3 => "Light Blue Wool",
|
||||
4 => "Yellow Wool",
|
||||
5 => "Lime Wool",
|
||||
6 => "Pink Wool",
|
||||
7 => "Gray Wool",
|
||||
8 => "Light Gray Wool",
|
||||
9 => "Cyan Wool",
|
||||
10 => "Purple Wool",
|
||||
11 => "Blue Wool",
|
||||
12 => "Brown Wool",
|
||||
13 => "Green Wool",
|
||||
14 => "Red Wool",
|
||||
15 => "Black Wool",
|
||||
);
|
||||
$this->name = $names[$this->meta];
|
||||
|
||||
$this->name = self::$names[$this->meta] ?? "Illegal Wool";
|
||||
$this->hardness = 4;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue