From 2ccdbf5259a7b73eb5aa379ea4f5ceefd0d5409e Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Thu, 2 Mar 2023 03:09:52 +0300 Subject: [PATCH] dye name fix --- src/material/item/generic/BucketItem.php | 5 ++- src/material/item/generic/DyeItem.php | 42 ++++++++++++------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/material/item/generic/BucketItem.php b/src/material/item/generic/BucketItem.php index c8cbff02..325659d8 100644 --- a/src/material/item/generic/BucketItem.php +++ b/src/material/item/generic/BucketItem.php @@ -8,10 +8,9 @@ class BucketItem extends Item{ 10 => "Lava Bucket" ); public function __construct($meta = 0, $count = 1){ - parent::__construct(BUCKET, $meta, $count, "Bucket"); + parent::__construct(BUCKET, $meta, $count, nullsafe(self::$possiblenames[$meta], "Bucket")); $this->isActivable = true; $this->maxStackSize = 1; - $this->name = isset(BucketItem::$possiblenames[$this->meta]) ? BucketItem::$possiblenames[$this->meta] : "Bucket"; } public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ @@ -47,4 +46,4 @@ class BucketItem extends Item{ } return false; } -} \ No newline at end of file +} diff --git a/src/material/item/generic/DyeItem.php b/src/material/item/generic/DyeItem.php index 79a0bd1b..d3e2f1d6 100755 --- a/src/material/item/generic/DyeItem.php +++ b/src/material/item/generic/DyeItem.php @@ -1,26 +1,26 @@ "Inc 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 => "Inc 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 & 0x15]; + parent::__construct(DYE, $meta, $count, nullsafe(self::$names[$meta], "Dye")); } -} \ No newline at end of file +}