mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-20 18:31:23 +00:00
Code Issues Projects Releases Wiki Activity

Handle InvalidArgumentException thrown by VanillaEnchantments::fromString (#3878)

Browse Source
This commit is contained in:
Muqsit Rayyan 2020-10-24 10:43:14 +05:00 committed by GitHub
parent 9947e13121
commit 3b632a8deb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/command/defaults/EnchantCommand.php
View File

@ -69,14 +69,18 @@ class EnchantCommand extends VanillaCommand{
if(is_numeric($args[1])){ if(is_numeric($args[1])){
$enchantment = VanillaEnchantments::byMcpeId((int) $args[1]); $enchantment = VanillaEnchantments::byMcpeId((int) $args[1]);
}else{
$enchantment = VanillaEnchantments::fromString($args[1]);
}
if(!($enchantment instanceof Enchantment)){ if(!($enchantment instanceof Enchantment)){
$sender->sendMessage(new TranslationContainer("commands.enchant.notFound", [$args[1]])); $sender->sendMessage(new TranslationContainer("commands.enchant.notFound", [$args[1]]));
return true; return true;
} }
}else{
try{
$enchantment = VanillaEnchantments::fromString($args[1]);
}catch(\InvalidArgumentException $e){
$sender->sendMessage(new TranslationContainer("commands.enchant.notFound", [$args[1]]));
return true;
}
}
$level = 1; $level = 1;
if(isset($args[2])){ if(isset($args[2])){