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

Moved enchantment ID handling to pocketmine/data/bedrock package

Browse Source 
this permits plugins to register their own enchantments mapped to MCPE IDs again.
This commit is contained in:
Dylan K. Taylor
2020-10-24 17:59:46 +01:00
parent 2e1239f77a
commit 47976bac34
8 changed files with 153 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/item/ItemEnchantmentHandlingTrait.php
View File

@ -40,12 +40,12 @@ trait ItemEnchantmentHandlingTrait{
}
public function hasEnchantment(Enchantment $enchantment, int $level = -1) : bool{
$id = $enchantment->getId();
$id = $enchantment->getRuntimeId();
return isset($this->enchantments[$id]) and ($level === -1 or $this->enchantments[$id]->getLevel() === $level);
}
public function getEnchantment(Enchantment $enchantment) : ?EnchantmentInstance{
return $this->enchantments[$enchantment->getId()] ?? null;
return $this->enchantments[$enchantment->getRuntimeId()] ?? null;
}
/**
@ -54,7 +54,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->getId()]);
unset($this->enchantments[$enchantment->getRuntimeId()]);
}
return $this;
@ -72,7 +72,7 @@ trait ItemEnchantmentHandlingTrait{
* @return $this
*/
public function addEnchantment(EnchantmentInstance $enchantment) : self{
$this->enchantments[$enchantment->getId()] = $enchantment;
$this->enchantments[$enchantment->getRuntimeId()] = $enchantment;
return $this;
}