Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update /kit delay to use updated yaml code.

This commit is contained in:
KHobbits 2012-09-02 18:11:29 +01:00
parent 6fd82480a3
commit 0b8a6c45c6
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/Kit.java
View File

@ -54,9 +54,9 @@ public class Kit
final long earliestLong = earliestTime.getTimeInMillis();
// When was the last kit used?
final Long lastTime = user.getKitTimestamp(kitName);
final long lastTime = user.getKitTimestamp(kitName);
if (lastTime == null || lastTime < earliestLong)
if (lastTime < earliestLong)
{
user.setKitTimestamp(kitName, time.getTimeInMillis());
}

35
Essentials/src/com/earth2me/essentials/UserData.java
View File

@ -4,6 +4,8 @@ import static com.earth2me.essentials.I18n._;
import java.io.File;
import java.util.*;
import org.bukkit.Location;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.MemoryConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@ -777,27 +779,44 @@ public abstract class UserData extends PlayerExtension implements IConf
{
return config.getBoolean("powertoolsenabled", true);
}
private Map<String, Object> kitTimestamps;
private ConfigurationSection kitTimestamps;
private Map<String, Object> _getKitTimestamps()
private ConfigurationSection _getKitTimestamps()
{
if (config.isConfigurationSection("timestamps.kits"))
{
return config.getConfigurationSection("timestamps.kits").getValues(false);
final ConfigurationSection section = config.getConfigurationSection("timestamps.kits");
final ConfigurationSection newSection = new MemoryConfiguration();
for (String command : section.getKeys(false))
{
if (section.isLong(command))
{
newSection.set(command.toLowerCase(Locale.ENGLISH), section.getLong(command));
}
else if (section.isInt(command))
{
newSection.set(command.toLowerCase(Locale.ENGLISH), (long)section.getInt(command));
}
}
return newSection;
}
return new HashMap<String, Object>();
return new MemoryConfiguration();
}
public Long getKitTimestamp(final String name)
public long getKitTimestamp(String name)
{
final Number num = (Number)kitTimestamps.get(name.toLowerCase(Locale.ENGLISH));
return num == null ? null : num.longValue();
name = name.replace('.', '_').replace('/', '_');
if (kitTimestamps != null)
{
return kitTimestamps.getLong(name, 0l);
}
return 0l;
}
public void setKitTimestamp(final String name, final long time)
{
kitTimestamps.put(name.toLowerCase(Locale.ENGLISH), time);
kitTimestamps.set(name.toLowerCase(Locale.ENGLISH), time);
config.setProperty("timestamps.kits", kitTimestamps);
config.save();
}