Remove the rest of not used permissions

This commit is contained in:
Shevchik 2013-09-30 11:27:31 +04:00
parent ddb244d477
commit 782af5a9da
3 changed files with 3 additions and 9 deletions

View File

@ -32,7 +32,7 @@ public class Chairs extends JavaPlugin {
public List<ChairBlock> allowedBlocks; public List<ChairBlock> allowedBlocks;
public List<Material> validSigns; public List<Material> validSigns;
public boolean autoRotate, signCheck, notifyplayer; public boolean autoRotate, signCheck, notifyplayer;
public boolean invertedStairCheck, invertedStepCheck, perItemPerms, ignoreIfBlockInHand; public boolean invertedStairCheck, invertedStepCheck, ignoreIfBlockInHand;
public boolean sitEffectsEnabled; public boolean sitEffectsEnabled;
public double sittingHeight, sittingHeightAdj, distance; public double sittingHeight, sittingHeightAdj, distance;
public int maxChairWidth; public int maxChairWidth;
@ -225,7 +225,6 @@ public class Chairs extends JavaPlugin {
notifyplayer = getConfig().getBoolean("notify-player"); notifyplayer = getConfig().getBoolean("notify-player");
invertedStairCheck = getConfig().getBoolean("upside-down-check"); invertedStairCheck = getConfig().getBoolean("upside-down-check");
invertedStepCheck = getConfig().getBoolean("upper-step-check"); invertedStepCheck = getConfig().getBoolean("upper-step-check");
perItemPerms = getConfig().getBoolean("per-item-perms");
ignoreIfBlockInHand = getConfig().getBoolean("ignore-if-block-in-hand"); ignoreIfBlockInHand = getConfig().getBoolean("ignore-if-block-in-hand");
sitEffectsEnabled = getConfig().getBoolean("sit-effects.enabled", false); sitEffectsEnabled = getConfig().getBoolean("sit-effects.enabled", false);

View File

@ -116,14 +116,12 @@ public class EventListener implements Listener {
} }
} }
if (blockOkay || if (blockOkay ||
(plugin.perItemPerms &&
( (
player.hasPermission("chairs.sit." + block.getTypeId() + ":" + block.getData()) || player.hasPermission("chairs.sit." + block.getTypeId() + ":" + block.getData()) ||
player.hasPermission("chairs.sit." + block.getType().toString() + ":" + block.getData()) || player.hasPermission("chairs.sit." + block.getType().toString() + ":" + block.getData()) ||
player.hasPermission("chairs.sit." + block.getTypeId()) || player.hasPermission("chairs.sit." + block.getTypeId()) ||
player.hasPermission("chairs.sit." + block.getType().toString()) player.hasPermission("chairs.sit." + block.getType().toString())
) )
)
) { ) {
if (block.getState().getData() instanceof Stairs) { if (block.getState().getData() instanceof Stairs) {

View File

@ -37,12 +37,9 @@ sign-check: false
distance: 2 distance: 2
sitting-height: 0.7 sitting-height: 0.7
sitting-height-adj: 1.0 sitting-height-adj: 1.0
permissions: true
notify-player: true notify-player: true
upside-down-check: true upside-down-check: true
upper-step-check: true upper-step-check: true
per-item-perms: true
ops-override-perms: false
ignore-if-block-in-hand: false ignore-if-block-in-hand: false
sit-effects: sit-effects:
enabled: false enabled: false