mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

Rename two misleadingly-named functions

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-02-27 12:59:12 +00:00
parent ba616ed8a7
commit 9ad0ea85c7
20 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/item/Durable.php
View File

@ -33,6 +33,10 @@ abstract class Durable extends Item{
/** @var int */
protected $damage = 0;
public function getMeta() : int{
return $this->damage;
}
/**
* Returns whether this item will take damage when used.
* @return bool

12
src/pocketmine/item/Item.php
View File

@ -657,7 +657,7 @@ class Item implements ItemIds, \JsonSerializable{
/**
* @return int
*/
public function getDamage() : int{
public function getMeta() : int{
return $this->meta;
}
@ -811,7 +811,7 @@ class Item implements ItemIds, \JsonSerializable{
* @return bool
*/
final public function equals(Item $item, bool $checkDamage = true, bool $checkCompound = true) : bool{
if($this->id === $item->getId() and (!$checkDamage or $this->getDamage() === $item->getDamage())){
if($this->id === $item->getId() and (!$checkDamage or $this->getMeta() === $item->getMeta())){
if($checkCompound){
if($this->hasNamedTag() and $item->hasNamedTag()){ //both items have NBT
return $this->getNamedTag()->equals($item->getNamedTag());
@ -841,7 +841,7 @@ class Item implements ItemIds, \JsonSerializable{
* @return string
*/
final public function __toString() : string{
return "Item " . $this->name . " (" . $this->id . ":" . ($this->hasAnyDamageValue() ? "?" : $this->getDamage()) . ")x" . $this->count . ($this->hasNamedTag() ? " tags:0x" . self::writeCompoundTag($this->nbt) : "");
return "Item " . $this->name . " (" . $this->id . ":" . ($this->hasAnyDamageValue() ? "?" : $this->getMeta()) . ")x" . $this->count . ($this->hasNamedTag() ? " tags:0x" . self::writeCompoundTag($this->nbt) : "");
}
/**
@ -854,8 +854,8 @@ class Item implements ItemIds, \JsonSerializable{
"id" => $this->getId()
];
if($this->getDamage() !== 0){
$data["damage"] = $this->getDamage();
if($this->getMeta() !== 0){
$data["damage"] = $this->getMeta();
}
if($this->getCount() !== 1){
@ -904,7 +904,7 @@ class Item implements ItemIds, \JsonSerializable{
$result = new CompoundTag($tagName, [
new ShortTag("id", $this->id),
new ByteTag("Count", Binary::signByte($this->count)),
new ShortTag("Damage", $this->getDamage())
new ShortTag("Damage", $this->getMeta())
]);
if($this->hasNamedTag()){

2
src/pocketmine/item/ItemFactory.php
View File

@ -330,7 +330,7 @@ class ItemFactory{
*/
public static function register(Item $item, bool $override = false){
$id = $item->getId();
$variant = $item->getDamage();
$variant = $item->getMeta();
if(!$override and self::isRegistered($id, $variant)){
throw new \RuntimeException("Trying to overwrite an already registered item");