Remove unused variable, reorganize config

This commit is contained in:
Shevchik 2013-12-14 22:13:19 +04:00
parent bd5b538f1d
commit 917e10e6dc
2 changed files with 5 additions and 6 deletions

View File

@ -33,7 +33,7 @@ public class Chairs extends JavaPlugin {
public boolean autoRotate, signCheck, notifyplayer; public boolean autoRotate, signCheck, notifyplayer;
public boolean invertedStairCheck, invertedStepCheck, ignoreIfBlockInHand; public boolean invertedStairCheck, invertedStepCheck, ignoreIfBlockInHand;
public boolean sitEffectsEnabled; public boolean sitEffectsEnabled;
public double sittingHeightAdj, distance; public double distance;
public int maxChairWidth; public int maxChairWidth;
public int sitMaxHealth; public int sitMaxHealth;
public int sitHealthPerInterval; public int sitHealthPerInterval;
@ -216,7 +216,6 @@ public class Chairs extends JavaPlugin {
FileConfiguration config = YamlConfiguration.loadConfiguration(new File(this.getDataFolder(),"config.yml")); FileConfiguration config = YamlConfiguration.loadConfiguration(new File(this.getDataFolder(),"config.yml"));
autoRotate = config.getBoolean("auto-rotate"); autoRotate = config.getBoolean("auto-rotate");
signCheck = config.getBoolean("sign-check"); signCheck = config.getBoolean("sign-check");
sittingHeightAdj = config.getDouble("sitting-height-adj");
distance = config.getDouble("distance"); distance = config.getDouble("distance");
maxChairWidth = config.getInt("max-chair-width"); maxChairWidth = config.getInt("max-chair-width");
notifyplayer = config.getBoolean("notify-player"); notifyplayer = config.getBoolean("notify-player");

View File

@ -3,15 +3,16 @@
# A list of all compatible block and item names: http://bit.ly/AmJgMb. # 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-block-settings: 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. # 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). # max-chair-width: Define how many blocks a chair can be long (set to number <= 0 for unlimited width).
# sign-check: If set to true, you will only be able to sit down when there are signs on both of the ends of the chair. # sign-check: If set to true, you will only be able to sit down when there are signs on both of the ends of the chair.
# distance: The maximum distance between the chair (the center of the block) and the player to be able to sit down (to prevent glitching through walls, etc.). # distance: The maximum distance between the chair (the center of the block) and the player to be able to sit down (to prevent glitching through walls, etc.).
# sitting-height-adj: Non-stairs and non-steps are adjusted automatically by this amount.
# upsidedown-check: If true then prevent players from sitting on upside down stairs. # upsidedown-check: If true then prevent players from sitting on upside down stairs.
# upper-step-check: If true then prevent players from sitting on an upper slab. # upper-step-check: If true then prevent players from sitting on an upper slab.
# seat-occupied-check: Check if seat is already occupied. # seat-occupied-check: Check if seat is already occupied.
# ignore-if-item-in-hand: Set this true disable sititng if player is holding an item in hand. # 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-block-settings:
- WOOD_STAIRS:0.7 - WOOD_STAIRS:0.7
@ -34,18 +35,17 @@ auto-rotate: true
max-chair-width: 3 max-chair-width: 3
sign-check: false sign-check: false
distance: 2 distance: 2
disabledWGRegions: []
sitting-height-adj: 1.0
notify-player: true
upside-down-check: true upside-down-check: true
upper-step-check: true upper-step-check: true
ignore-if-item-in-hand: false ignore-if-item-in-hand: false
disabledWGRegions: []
sit-effects: sit-effects:
enabled: false enabled: false
interval: 20 interval: 20
healing: healing:
amount: 1 amount: 1
max-percent: 100 max-percent: 100
notify-player: true
messages: messages:
sitting: '&7You are now sitting.' sitting: '&7You are now sitting.'
standing: '&7You are no longer sitting.' standing: '&7You are no longer sitting.'