TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-08-13 22:46:18 +00:00
Code Issues Projects Releases Wiki Activity

Some nice friendly messages to help debugging command costs.

Browse source
This commit is contained in:
KHobbits 2012-12-08 15:50:50 +00:00
parent bbc306970f
commit ba380e61ee
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Essentials/src/com/earth2me/essentials/Settings.java
View file

@ -12,6 +12,7 @@ import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.PluginCommand;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.MemoryConfiguration; import org.bukkit.configuration.MemoryConfiguration;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -189,6 +190,11 @@ public class Settings implements ISettings
final ConfigurationSection newSection = new MemoryConfiguration(); final ConfigurationSection newSection = new MemoryConfiguration();
for (String command : section.getKeys(false)) for (String command : section.getKeys(false))
{ {
PluginCommand cmd = ess.getServer().getPluginCommand(command);
if (cmd == null || !cmd.getPlugin().equals(ess))
{
ess.getLogger().warning("Invalid command cost. '" + command + "' is not a command handled by Essentials.");
}
if (section.isDouble(command)) if (section.isDouble(command))
{ {
newSection.set(command.toLowerCase(Locale.ENGLISH), section.getDouble(command)); newSection.set(command.toLowerCase(Locale.ENGLISH), section.getDouble(command));
@ -197,6 +203,24 @@ public class Settings implements ISettings
{ {
newSection.set(command.toLowerCase(Locale.ENGLISH), (double)section.getInt(command)); newSection.set(command.toLowerCase(Locale.ENGLISH), (double)section.getInt(command));
} }
else if (section.isString(command))
{
String costString = section.getString(command);
try
{
double cost = Double.parseDouble(costString.trim().replace(getCurrencySymbol(), "").replaceAll("\\W", ""));
newSection.set(command.toLowerCase(Locale.ENGLISH), cost);
}
catch (NumberFormatException ex)
{
ess.getLogger().warning("Invalid command cost for: " + command + " (" + costString + ")");
}
}
else
{
ess.getLogger().warning("Invalid command cost for: " + command);
}
} }
return newSection; return newSection;
} }
@ -946,12 +970,13 @@ public class Settings implements ISettings
double maxSpeed = config.getDouble("max-walk-speed", 0.8); double maxSpeed = config.getDouble("max-walk-speed", 0.8);
return maxSpeed > 1.0 ? 1.0 : Math.abs(maxSpeed); return maxSpeed > 1.0 ? 1.0 : Math.abs(maxSpeed);
} }
private int mailsPerMinute; private int mailsPerMinute;
private int _getMailsPerMinute() { private int _getMailsPerMinute()
{
return config.getInt("mails-per-minute", 1000); return config.getInt("mails-per-minute", 1000);
} }
@Override @Override
public int getMailsPerMinute() public int getMailsPerMinute()
{ {