From 782af5a9dac5160198b1cd982bf3d6396a9c0c68 Mon Sep 17 00:00:00 2001 From: Shevchik Date: Mon, 30 Sep 2013 11:27:31 +0400 Subject: [PATCH] Remove the rest of not used permissions --- src/com/cnaude/chairs/Chairs.java | 3 +-- src/com/cnaude/chairs/EventListener.java | 6 ++---- src/config.yml | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/com/cnaude/chairs/Chairs.java b/src/com/cnaude/chairs/Chairs.java index 507dce5..56a70ce 100644 --- a/src/com/cnaude/chairs/Chairs.java +++ b/src/com/cnaude/chairs/Chairs.java @@ -32,7 +32,7 @@ public class Chairs extends JavaPlugin { public List allowedBlocks; public List validSigns; public boolean autoRotate, signCheck, notifyplayer; - public boolean invertedStairCheck, invertedStepCheck, perItemPerms, ignoreIfBlockInHand; + public boolean invertedStairCheck, invertedStepCheck, ignoreIfBlockInHand; public boolean sitEffectsEnabled; public double sittingHeight, sittingHeightAdj, distance; public int maxChairWidth; @@ -225,7 +225,6 @@ public class Chairs extends JavaPlugin { notifyplayer = getConfig().getBoolean("notify-player"); invertedStairCheck = getConfig().getBoolean("upside-down-check"); invertedStepCheck = getConfig().getBoolean("upper-step-check"); - perItemPerms = getConfig().getBoolean("per-item-perms"); ignoreIfBlockInHand = getConfig().getBoolean("ignore-if-block-in-hand"); sitEffectsEnabled = getConfig().getBoolean("sit-effects.enabled", false); diff --git a/src/com/cnaude/chairs/EventListener.java b/src/com/cnaude/chairs/EventListener.java index 7b08f84..ee83f79 100644 --- a/src/com/cnaude/chairs/EventListener.java +++ b/src/com/cnaude/chairs/EventListener.java @@ -116,14 +116,12 @@ public class EventListener implements Listener { } } if (blockOkay || - (plugin.perItemPerms && - ( + ( player.hasPermission("chairs.sit." + block.getTypeId() + ":" + block.getData()) || player.hasPermission("chairs.sit." + block.getType().toString() + ":" + block.getData()) || player.hasPermission("chairs.sit." + block.getTypeId()) || player.hasPermission("chairs.sit." + block.getType().toString()) - ) - ) + ) ) { if (block.getState().getData() instanceof Stairs) { diff --git a/src/config.yml b/src/config.yml index 2b21624..784964e 100644 --- a/src/config.yml +++ b/src/config.yml @@ -37,12 +37,9 @@ sign-check: false distance: 2 sitting-height: 0.7 sitting-height-adj: 1.0 -permissions: true notify-player: true upside-down-check: true upper-step-check: true -per-item-perms: true -ops-override-perms: false ignore-if-block-in-hand: false sit-effects: enabled: false