From 92188fd45eab20828d05bc46ab7876db6741effe Mon Sep 17 00:00:00 2001 From: Shevchik Date: Thu, 2 Jan 2014 17:43:57 +0400 Subject: [PATCH] Rename some variables --- src/com/cnaude/chairs/ChairEffects.java | 2 +- src/com/cnaude/chairs/Chairs.java | 10 +++++----- src/com/cnaude/chairs/ChairsCommand.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/cnaude/chairs/ChairEffects.java b/src/com/cnaude/chairs/ChairEffects.java index 0c136c4..8a91e56 100644 --- a/src/com/cnaude/chairs/ChairEffects.java +++ b/src/com/cnaude/chairs/ChairEffects.java @@ -53,6 +53,6 @@ public class ChairEffects { } } } - }, plugin.sitEffectInterval, plugin.sitEffectInterval); + }, plugin.sitHealInterval, plugin.sitHealInterval); } } diff --git a/src/com/cnaude/chairs/Chairs.java b/src/com/cnaude/chairs/Chairs.java index 7e896d1..22b92fb 100644 --- a/src/com/cnaude/chairs/Chairs.java +++ b/src/com/cnaude/chairs/Chairs.java @@ -25,13 +25,13 @@ public class Chairs extends JavaPlugin { public List validSigns; public boolean autoRotate, signCheck, notifyplayer; public boolean ignoreIfBlockInHand; - public boolean sitEffectsEnabled; public double distance; public HashSet disabledRegions = new HashSet(); public int maxChairWidth; + public boolean sitHealEnabled; public int sitMaxHealth; public int sitHealthPerInterval; - public int sitEffectInterval; + public int sitHealInterval; public boolean sitDisableAllCommands = false; public HashSet sitDisabledCommands = new HashSet(); private Logger log; @@ -77,7 +77,7 @@ public class Chairs extends JavaPlugin { getConfig().options().copyDefaults(true); saveConfig(); loadConfig(); - if (sitEffectsEnabled) { + if (sitHealEnabled) { chairEffects.startHealing(); } psitdata = new PlayerSitData(this); @@ -115,8 +115,8 @@ public class Chairs extends JavaPlugin { disabledRegions = new HashSet(config.getStringList("disabledWGRegions")); - sitEffectsEnabled = config.getBoolean("sit-effects.healing.enabled", false); - sitEffectInterval = config.getInt("sit-effects.healing.interval",20); + sitHealEnabled = config.getBoolean("sit-effects.healing.enabled", false); + sitHealInterval = config.getInt("sit-effects.healing.interval",20); sitMaxHealth = config.getInt("sit-effects.healing.max-percent",100); sitHealthPerInterval = config.getInt("sit-effects.healing.amount",1); diff --git a/src/com/cnaude/chairs/ChairsCommand.java b/src/com/cnaude/chairs/ChairsCommand.java index 4b1f196..8361780 100644 --- a/src/com/cnaude/chairs/ChairsCommand.java +++ b/src/com/cnaude/chairs/ChairsCommand.java @@ -39,7 +39,7 @@ public class ChairsCommand implements CommandExecutor { if (args[0].equalsIgnoreCase("reload")) { if (sender.hasPermission("chairs.reload") || !(sender instanceof Player)) { plugin.loadConfig(); - if (plugin.sitEffectsEnabled) { + if (plugin.sitHealEnabled) { plugin.chairEffects.restartHealing(); } else { plugin.chairEffects.cancelHealing();