Upstream/AreaShop
1
0
Fork 0
mirror of https://github.com/NLthijs48/AreaShop.git synced 2024-11-26 20:26:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix a bug with settings in groups.yml and region files

Browse Source 
Now if a value has been set for a certain setting it will use it for
sure, now if you use getDoubleSetting() the following happends: 15.0 ->
15.0, 7 -> 7.0, '8.0' -> 8.0, 'bs' -> 0.0. While before only 15.0 would
see it as double, and for the others it would continue searching at the
next place (individual files > groups > default.yml).
This commit is contained in:
Thijs Wiefferink 2014-12-10 13:14:30 +01:00
parent c12314fa98
commit 5b961564e1
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nl/evolutioncoding/areashop/Metrics.java
View File

@ -332,6 +332,7 @@ public class Metrics {
boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
String pluginVersion = description.getVersion();
String serverVersion = Bukkit.getVersion();
// TODO change to different method
int playersOnline = Bukkit.getServer().getOnlinePlayers().length;
// END server software specific section -- all code below does not use any code outside of this class / Java

30
src/nl/evolutioncoding/areashop/regions/GeneralRegion.java
View File

@ -1618,14 +1618,14 @@ public abstract class GeneralRegion {
// CONFIG
public boolean getBooleanSetting(String path) {
if(config.isBoolean(path)) {
if(config.isSet(path)) {
return config.getBoolean(path);
}
boolean result = false;
int priority = Integer.MIN_VALUE;
boolean found = false;
for(RegionGroup group : plugin.getFileManager().getGroups()) {
if(group.isMember(this) && group.getSettings().isBoolean(path) && group.getPriority() > priority) {
if(group.isMember(this) && group.getSettings().isSet(path) && group.getPriority() > priority) {
result = group.getSettings().getBoolean(path);
priority = group.getPriority();
found = true;
@ -1638,14 +1638,14 @@ public abstract class GeneralRegion {
}
public int getIntegerSetting(String path) {
if(config.isInt(path)) {
if(config.isSet(path)) {
return config.getInt(path);
}
int result = 0;
int priority = Integer.MIN_VALUE;
boolean found = false;
for(RegionGroup group : plugin.getFileManager().getGroups()) {
if(group.isMember(this) && group.getSettings().isInt(path) && group.getPriority() > priority) {
if(group.isMember(this) && group.getSettings().isSet(path) && group.getPriority() > priority) {
result = group.getSettings().getInt(path);
priority = group.getPriority();
found = true;
@ -1658,14 +1658,20 @@ public abstract class GeneralRegion {
}
public double getDoubleSetting(String path) {
if(config.isDouble(path)) {
AreaShop.debug("getDoubleSetting(" + path + "):");
AreaShop.debug(" config.isDouble() = " + config.isDouble(path));
AreaShop.debug(" config.getDouble() = " + config.getDouble(path));
AreaShop.debug(" config.isInteger() = " + config.isInt(path));
AreaShop.debug(" config.getInteger() = " + config.getInt(path));
AreaShop.debug(" config.isSet() = " + config.isSet(path));
if(config.isSet(path)) {
return config.getDouble(path);
}
double result = 0;
int priority = Integer.MIN_VALUE;
boolean found = false;
for(RegionGroup group : plugin.getFileManager().getGroups()) {
if(group.isMember(this) && group.getSettings().isDouble(path) && group.getPriority() > priority) {
if(group.isMember(this) && group.getSettings().isSet(path) && group.getPriority() > priority) {
result = group.getSettings().getDouble(path);
priority = group.getPriority();
found = true;
@ -1678,14 +1684,14 @@ public abstract class GeneralRegion {
}
public long getLongSetting(String path) {
if(config.isLong(path)) {
if(config.isSet(path)) {
return config.getLong(path);
}
long result = 0;
int priority = Integer.MIN_VALUE;
boolean found = false;
for(RegionGroup group : plugin.getFileManager().getGroups()) {
if(group.isMember(this) && group.getSettings().isLong(path) && group.getPriority() > priority) {
if(group.isMember(this) && group.getSettings().isSet(path) && group.getPriority() > priority) {
result = group.getSettings().getLong(path);
priority = group.getPriority();
found = true;
@ -1698,14 +1704,14 @@ public abstract class GeneralRegion {
}
public String getStringSetting(String path) {
if(config.isString(path)) {
if(config.isSet(path)) {
return config.getString(path);
}
String result = null;
int priority = Integer.MIN_VALUE;
boolean found = false;
for(RegionGroup group : plugin.getFileManager().getGroups()) {
if(group.isMember(this) && group.getSettings().isString(path) && group.getPriority() > priority) {
if(group.isMember(this) && group.getSettings().isSet(path) && group.getPriority() > priority) {
result = group.getSettings().getString(path);
priority = group.getPriority();
found = true;
@ -1718,14 +1724,14 @@ public abstract class GeneralRegion {
}
public List<String> getStringListSetting(String path) {
if(config.isList(path)) {
if(config.isSet(path)) {
return config.getStringList(path);
}
List<String> result = null;
int priority = Integer.MIN_VALUE;
boolean found = false;
for(RegionGroup group : plugin.getFileManager().getGroups()) {
if(group.isMember(this) && group.getSettings().isString(path) && group.getPriority() > priority) {
if(group.isMember(this) && group.getSettings().isSet(path) && group.getPriority() > priority) {
result = group.getSettings().getStringList(path);
priority = group.getPriority();
found = true;