mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 10:53:05 +00:00
Code Issues Projects Releases Wiki Activity

Drop enchantment runtime IDs

Browse Source
This commit is contained in:
Dylan K. Taylor
2021-09-03 21:20:43 +01:00
parent ed1e7322dd
commit c062282954
6 changed files with 34 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/item/ItemEnchantmentHandlingTrait.php
View File

@ -26,6 +26,7 @@ namespace pocketmine\item;
use pocketmine\item\enchantment\Enchantment;
use pocketmine\item\enchantment\EnchantmentInstance;
use function count;
use function spl_object_id;
/**
* This trait encapsulates all enchantment handling needed for itemstacks.
@ -40,12 +41,12 @@ trait ItemEnchantmentHandlingTrait{
}
public function hasEnchantment(Enchantment $enchantment, int $level = -1) : bool{
$id = $enchantment->getRuntimeId();
$id = spl_object_id($enchantment);
return isset($this->enchantments[$id]) and ($level === -1 or $this->enchantments[$id]->getLevel() === $level);
}
public function getEnchantment(Enchantment $enchantment) : ?EnchantmentInstance{
return $this->enchantments[$enchantment->getRuntimeId()] ?? null;
return $this->enchantments[spl_object_id($enchantment)] ?? null;
}
/**
@ -54,7 +55,7 @@ trait ItemEnchantmentHandlingTrait{
public function removeEnchantment(Enchantment $enchantment, int $level = -1) : self{
$instance = $this->getEnchantment($enchantment);
if($instance !== null and ($level === -1 or $instance->getLevel() === $level)){
unset($this->enchantments[$enchantment->getRuntimeId()]);
unset($this->enchantments[spl_object_id($enchantment)]);
}
return $this;
@ -72,7 +73,7 @@ trait ItemEnchantmentHandlingTrait{
* @return $this
*/
public function addEnchantment(EnchantmentInstance $enchantment) : self{
$this->enchantments[$enchantment->getRuntimeId()] = $enchantment;
$this->enchantments[spl_object_id($enchantment->getType())] = $enchantment;
return $this;
}