Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Enchantment Name Support - EnchantCommand #2009

Merged
merged 4 commits into from
Oct 1, 2016
Merged

Enchantment Name Support - EnchantCommand #2009

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d512f9
Enchantment Name Support - EnchantCommand
Oct 1, 2016
e2cd735
Update EnchantCommand.php
Oct 1, 2016
3037b09
Update Enchantment.php
Oct 1, 2016
084e462
Conform to PocketMine code styling
dktapps Oct 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Conform to PocketMine code styling
  • Loading branch information
@dktapps
dktapps authored Oct 1, 2016
commit 084e462b51bcfbf9f1f268447a327c8f6e1a920a
18 changes: 6 additions & 12 deletions src/pocketmine/item/enchantment/Enchantment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,23 +183,17 @@ public static function getEnchantment($id){
public static function getEnchantmentByName($name){
if(defined(Enchantment::class . "::TYPE_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_" . strtoupper($name)));
}
else if(defined(Enchantment::class . "::TYPE_WEAPON_" . strtoupper($name))){
}elseif(defined(Enchantment::class . "::TYPE_WEAPON_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_WEAPON_" . strtoupper($name)));
}
else if(defined(Enchantment::class . "::TYPE_ARMOR_" . strtoupper($name))){
}elseif(defined(Enchantment::class . "::TYPE_ARMOR_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_ARMOR_" . strtoupper($name)));
}
else if(defined(Enchantment::class . "::TYPE_MINING_" . strtoupper($name))){
}elseif(defined(Enchantment::class . "::TYPE_MINING_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_MINING_" . strtoupper($name)));
}
else if(defined(Enchantment::class . "::TYPE_BOW_" . strtoupper($name))){
}elseif(defined(Enchantment::class . "::TYPE_BOW_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_BOW_" . strtoupper($name)));
}
else if(defined(Enchantment::class . "::TYPE_FISHING_" . strtoupper($name))){
}elseif(defined(Enchantment::class . "::TYPE_FISHING_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_FISHING_" . strtoupper($name)));
}
else{
}else{
return new Enchantment(self::TYPE_INVALID, "unknown", 0, 0, 0);
}
}
Expand Down