Rename some variables

This commit is contained in:
Shevchik 2014-01-02 17:43:57 +04:00
parent 45dd783f89
commit 92188fd45e
3 changed files with 7 additions and 7 deletions

View File

@ -53,6 +53,6 @@ public class ChairEffects {
} }
} }
} }
}, plugin.sitEffectInterval, plugin.sitEffectInterval); }, plugin.sitHealInterval, plugin.sitHealInterval);
} }
} }

View File

@ -25,13 +25,13 @@ public class Chairs extends JavaPlugin {
public List<Material> validSigns; public List<Material> validSigns;
public boolean autoRotate, signCheck, notifyplayer; public boolean autoRotate, signCheck, notifyplayer;
public boolean ignoreIfBlockInHand; public boolean ignoreIfBlockInHand;
public boolean sitEffectsEnabled;
public double distance; public double distance;
public HashSet<String> disabledRegions = new HashSet<String>(); public HashSet<String> disabledRegions = new HashSet<String>();
public int maxChairWidth; public int maxChairWidth;
public boolean sitHealEnabled;
public int sitMaxHealth; public int sitMaxHealth;
public int sitHealthPerInterval; public int sitHealthPerInterval;
public int sitEffectInterval; public int sitHealInterval;
public boolean sitDisableAllCommands = false; public boolean sitDisableAllCommands = false;
public HashSet<String> sitDisabledCommands = new HashSet<String>(); public HashSet<String> sitDisabledCommands = new HashSet<String>();
private Logger log; private Logger log;
@ -77,7 +77,7 @@ public class Chairs extends JavaPlugin {
getConfig().options().copyDefaults(true); getConfig().options().copyDefaults(true);
saveConfig(); saveConfig();
loadConfig(); loadConfig();
if (sitEffectsEnabled) { if (sitHealEnabled) {
chairEffects.startHealing(); chairEffects.startHealing();
} }
psitdata = new PlayerSitData(this); psitdata = new PlayerSitData(this);
@ -115,8 +115,8 @@ public class Chairs extends JavaPlugin {
disabledRegions = new HashSet<String>(config.getStringList("disabledWGRegions")); disabledRegions = new HashSet<String>(config.getStringList("disabledWGRegions"));
sitEffectsEnabled = config.getBoolean("sit-effects.healing.enabled", false); sitHealEnabled = config.getBoolean("sit-effects.healing.enabled", false);
sitEffectInterval = config.getInt("sit-effects.healing.interval",20); sitHealInterval = config.getInt("sit-effects.healing.interval",20);
sitMaxHealth = config.getInt("sit-effects.healing.max-percent",100); sitMaxHealth = config.getInt("sit-effects.healing.max-percent",100);
sitHealthPerInterval = config.getInt("sit-effects.healing.amount",1); sitHealthPerInterval = config.getInt("sit-effects.healing.amount",1);

View File

@ -39,7 +39,7 @@ public class ChairsCommand implements CommandExecutor {
if (args[0].equalsIgnoreCase("reload")) { if (args[0].equalsIgnoreCase("reload")) {
if (sender.hasPermission("chairs.reload") || !(sender instanceof Player)) { if (sender.hasPermission("chairs.reload") || !(sender instanceof Player)) {
plugin.loadConfig(); plugin.loadConfig();
if (plugin.sitEffectsEnabled) { if (plugin.sitHealEnabled) {
plugin.chairEffects.restartHealing(); plugin.chairEffects.restartHealing();
} else { } else {
plugin.chairEffects.cancelHealing(); plugin.chairEffects.cancelHealing();