PandacubeFr/ChairsReloaded
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove sitting height setting.

Browse Source
This commit is contained in:
Shevchik 2013-12-13 13:17:35 +04:00
parent 83e4f447a8
commit 89309be623
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/cnaude/chairs/Chairs.java
View File

@ -29,7 +29,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 sittingHeight, sittingHeightAdj, distance; public double sittingHeightAdj, distance;
public int maxChairWidth; public int maxChairWidth;
public int sitMaxHealth; public int sitMaxHealth;
public int sitHealthPerInterval; public int sitHealthPerInterval;
@ -144,7 +144,6 @@ public class Chairs extends JavaPlugin {
public void loadConfig() { public void loadConfig() {
autoRotate = getConfig().getBoolean("auto-rotate"); autoRotate = getConfig().getBoolean("auto-rotate");
signCheck = getConfig().getBoolean("sign-check"); signCheck = getConfig().getBoolean("sign-check");
sittingHeight = getConfig().getDouble("sitting-height");
sittingHeightAdj = getConfig().getDouble("sitting-height-adj"); sittingHeightAdj = getConfig().getDouble("sitting-height-adj");
distance = getConfig().getDouble("distance"); distance = getConfig().getDouble("distance");
maxChairWidth = getConfig().getInt("max-chair-width"); maxChairWidth = getConfig().getInt("max-chair-width");
@ -171,7 +170,7 @@ public class Chairs extends JavaPlugin {
allowedBlocks = new ArrayList<ChairBlock>(); allowedBlocks = new ArrayList<ChairBlock>();
for (String s : getConfig().getStringList("allowed-blocks")) { for (String s : getConfig().getStringList("allowed-blocks")) {
String type; String type;
double sh = sittingHeight; double sh = 0.7;
String d = "0"; String d = "0";
if (s.contains(":")) { if (s.contains(":")) {
String tmp[] = s.split(":",3); String tmp[] = s.split(":",3);

2
src/com/cnaude/chairs/EventListener.java
View File

@ -221,7 +221,7 @@ public class EventListener implements Listener {
private Location getSitLocation(Block block, Float playerYaw) private Location getSitLocation(Block block, Float playerYaw)
{ {
double sh = plugin.sittingHeight; double sh = 0.7;
for (ChairBlock cb : plugin.allowedBlocks) { for (ChairBlock cb : plugin.allowedBlocks) {
if (cb.getMat().toString().contains("STAIRS")) { if (cb.getMat().toString().contains("STAIRS")) {

21
src/config.yml
View File

@ -16,16 +16,16 @@
# 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.
# ------ # ------
allowed-blocks: allowed-blocks:
- WOOD_STAIRS - WOOD_STAIRS:0.7
- SPRUCE_WOOD_STAIRS - SPRUCE_WOOD_STAIRS:0.7
- JUNGLE_WOOD_STAIRS - JUNGLE_WOOD_STAIRS:0.7
- BIRCH_WOOD_STAIRS - BIRCH_WOOD_STAIRS:0.7
- SANDSTONE_STAIRS - SANDSTONE_STAIRS:0.7
- COBBLESTONE_STAIRS - COBBLESTONE_STAIRS:0.7
- BRICK_STAIRS - BRICK_STAIRS:0.7
- SMOOTH_STAIRS - SMOOTH_STAIRS:0.7
- NETHER_BRICK_STAIRS - NETHER_BRICK_STAIRS:0.7
- QUARTZ_STAIRS - QUARTZ_STAIRS:0.7
valid-signs: valid-signs:
- SIGN - SIGN
- WALL_SIGN - WALL_SIGN
@ -36,7 +36,6 @@ max-chair-width: 3
sign-check: false sign-check: false
distance: 2 distance: 2
disabledRegions: [] disabledRegions: []
sitting-height: 0.7
sitting-height-adj: 1.0 sitting-height-adj: 1.0
notify-player: true notify-player: true
upside-down-check: true upside-down-check: true