diff --git a/src/com/cnaude/chairs/Chairs.java b/src/com/cnaude/chairs/Chairs.java index b1242b7..6bf5d37 100644 --- a/src/com/cnaude/chairs/Chairs.java +++ b/src/com/cnaude/chairs/Chairs.java @@ -30,7 +30,7 @@ public class Chairs extends JavaPlugin { public List allowedBlocks; public List validSigns; public boolean autoRotate, signCheck, permissions, notifyplayer, opsOverridePerms; - public boolean invertedStairCheck, seatOccupiedCheck, invertedStepCheck, perItemPerms, ignoreIfBlockInHand; + public boolean invertedStairCheck, invertedStepCheck, perItemPerms, ignoreIfBlockInHand; public boolean sitEffectsEnabled; public boolean authmelogincorrection; public double sittingHeight, sittingHeightAdj, distance; @@ -177,7 +177,6 @@ public class Chairs extends JavaPlugin { permissions = getConfig().getBoolean("permissions"); notifyplayer = getConfig().getBoolean("notify-player"); invertedStairCheck = getConfig().getBoolean("upside-down-check"); - seatOccupiedCheck = getConfig().getBoolean("seat-occupied-check"); invertedStepCheck = getConfig().getBoolean("upper-step-check"); perItemPerms = getConfig().getBoolean("per-item-perms"); opsOverridePerms = getConfig().getBoolean("ops-override-perms"); diff --git a/src/com/cnaude/chairs/EventListener.java b/src/com/cnaude/chairs/EventListener.java index a5f6dea..6fe0554 100644 --- a/src/com/cnaude/chairs/EventListener.java +++ b/src/com/cnaude/chairs/EventListener.java @@ -244,20 +244,17 @@ public class EventListener implements Listener { } } - // Sit-down process. - if (plugin.seatOccupiedCheck) { - if (!plugin.sit.isEmpty()) { - if (plugin.sitblock.containsKey(block)) - { - if (!plugin.msgOccupied.isEmpty()) { - player.sendMessage(plugin.msgOccupied.replaceAll("%PLAYER%", plugin.sitblock.get(block))); - } - return false; - } - } - } + //Sit occupied check + if (plugin.sitblock.containsKey(block)) + { + if (!plugin.msgOccupied.isEmpty()) { + player.sendMessage(plugin.msgOccupied.replaceAll("%PLAYER%", plugin.sitblock.get(block))); + } + return false; + } } return true; + } private Location getSitLocation(Block block, Float playerYaw) diff --git a/src/config.yml b/src/config.yml index 3a6c9d8..9c06560 100644 --- a/src/config.yml +++ b/src/config.yml @@ -41,7 +41,6 @@ sitting-height-adj: 1.0 permissions: true notify-player: true upside-down-check: true -seat-occupied-check: true upper-step-check: true per-item-perms: true ops-override-perms: false diff --git a/target/Chairs.jar b/target/Chairs.jar index 71f7419..627e2fe 100644 Binary files a/target/Chairs.jar and b/target/Chairs.jar differ