From adde90b9eb9f1d8182b0f2a42e05330c566144b8 Mon Sep 17 00:00:00 2001
From: Shevchik <Shev4ik.den@gmail.com>
Date: Sun, 15 Dec 2013 15:56:26 +0400
Subject: [PATCH] Change sit-block-settings to sit-blocks

---
 src/com/cnaude/chairs/Chairs.java | 21 ++++++++-------------
 src/config.yml                    |  4 ++--
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/com/cnaude/chairs/Chairs.java b/src/com/cnaude/chairs/Chairs.java
index 30a07ee..0685b90 100644
--- a/src/com/cnaude/chairs/Chairs.java
+++ b/src/com/cnaude/chairs/Chairs.java
@@ -252,25 +252,20 @@ public class Chairs extends JavaPlugin {
         msgReloaded = ChatColor.translateAlternateColorCodes('&',config.getString("messages.reloaded"));
 
         allowedBlocks = new ArrayList<ChairBlock>();
-        for (String s : config.getStringList("sit-block-settings")) {
+        for (String s : config.getStringList("sit-blocks")) {
             String type;
             double sh = 0.7;
             String tmp[] = s.split("[:]");
             type = tmp[0];         
             if (tmp.length == 2) {
                sh = Double.parseDouble(tmp[1]);
-            }
-            try {                
-                Material mat = Material.matchMaterial(type);
-                if (mat != null) {                    
-                    logInfo("Allowed block: " + mat.toString() + " => " + sh);
-                    allowedBlocks.add(new ChairBlock(mat,sh));
-                } else {
-                    logError("Invalid block: " + type);
-                }
-            }
-            catch (Exception e) {
-                logError(e.getMessage());
+            }             
+            Material mat = Material.matchMaterial(type);
+            if (mat != null) {                    
+                logInfo("Allowed block: " + mat.toString() + " => " + sh);
+                allowedBlocks.add(new ChairBlock(mat,sh));
+            } else {
+                logError("Invalid block: " + type);
             }
         }
         
diff --git a/src/config.yml b/src/config.yml
index 7d0e6b4..fb354a4 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -2,7 +2,7 @@
 # ------
 # A list of all compatible block and item names: http://bit.ly/AmJgMb.
 # ------
-# sit-block-settings: Set the blocks you want to be able to sit down on and sitting height. Use material_name:sitting_height
+# sit-blocks: Set the blocks you want to be able to sit down on and sitting height. Use material_name:sitting_height
 # valid-signs: Valid sign materials for sign check
 # auto-rotate: If set to true, you are automatically rotated to the descending face of the stairs-block when sitting down.
 # max-chair-width: Define how many blocks a chair can be long (set to number <= 0 for unlimited width).
@@ -14,7 +14,7 @@
 # ignore-if-item-in-hand: Set this true disable sititng if player is holding an item in hand.
 # disabledWGRegions: You won't be able to sit in this regions
 # ------
-sit-block-settings:
+sit-blocks:
   - WOOD_STAIRS:0.7
   - SPRUCE_WOOD_STAIRS:0.7
   - JUNGLE_WOOD_STAIRS:0.7