Now don't throws exceptions

Khanx · May 30, 2018 · 057de0b · 057de0b
1 parent da10bb1
commit 057de0b
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/AdvancedWand/AdvancedWand/Helper/CommandHelper.cs b/AdvancedWand/AdvancedWand/Helper/CommandHelper.cs
@@ -48,7 +48,11 @@ private static bool CheckBlock(Players.Player player, ushort block)
             if(0 == block)  //Air block
                 return true;
 
-            ItemTypes.ItemType type = ItemTypes.GetType(block);
+            if(!ItemTypes.TryGetType(block, out ItemTypes.ItemType type))
+            {
+                Pipliz.Chatting.Chat.Send(player, "<color=red>Block not found</color>");
+                return false;
+            }
 
             if(!type.IsPlaceable || type.NeedsBase || !ItemTypes.NotableTypes.Contains(type))
             {
@@ -64,14 +68,9 @@ public static bool GetBlockIndex(Players.Player player, string block, out ushort
         {
             blockIndex = 0;
 
-            try
-            {
-                if(int.TryParse(block, out int IDBlock))
-                    blockIndex = (ushort)IDBlock;
-                else
-                    blockIndex = ItemTypes.IndexLookup.GetIndex(block);
-            }
-            catch(System.ArgumentException)
+            if(int.TryParse(block, out int IDBlock))
+                blockIndex = (ushort)IDBlock;
+            else if(!ItemTypes.IndexLookup.TryGetIndex(block, out blockIndex))
             {
                 Pipliz.Chatting.Chat.Send(player, "<color=red>Block not found</color>");
                 return false;