For now always check if sit is occupied otherwise it can glitch like hell
This commit is contained in:
parent
3177a63ba2
commit
4d9ae43d0c
@ -30,7 +30,7 @@ public class Chairs extends JavaPlugin {
|
||||
public List<ChairBlock> allowedBlocks;
|
||||
public List<Material> 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");
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user