mirror of
https://github.com/essentials/Essentials.git
synced 2025-09-03 03:32:42 +02:00
Don't set last location if it's invalid
This commit is contained in:
@@ -249,12 +249,13 @@ public abstract class UserData extends PlayerExtension implements IConf
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clearAllPowertools() {
|
public void clearAllPowertools()
|
||||||
|
{
|
||||||
powertools.clear();
|
powertools.clear();
|
||||||
config.setProperty("powertools", powertools);
|
config.setProperty("powertools", powertools);
|
||||||
config.save();
|
config.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<String> getPowertool(ItemStack stack)
|
public List<String> getPowertool(ItemStack stack)
|
||||||
{
|
{
|
||||||
return (List<String>)powertools.get(stack.getTypeId());
|
return (List<String>)powertools.get(stack.getTypeId());
|
||||||
@@ -273,12 +274,11 @@ public abstract class UserData extends PlayerExtension implements IConf
|
|||||||
config.setProperty("powertools", powertools);
|
config.setProperty("powertools", powertools);
|
||||||
config.save();
|
config.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasPowerTools()
|
public boolean hasPowerTools()
|
||||||
{
|
{
|
||||||
return powertools.size() > 0;
|
return powertools.size() > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Location lastLocation;
|
private Location lastLocation;
|
||||||
|
|
||||||
private Location _getLastLocation()
|
private Location _getLastLocation()
|
||||||
@@ -300,6 +300,10 @@ public abstract class UserData extends PlayerExtension implements IConf
|
|||||||
|
|
||||||
public void setLastLocation(Location loc)
|
public void setLastLocation(Location loc)
|
||||||
{
|
{
|
||||||
|
if (loc == null || loc.getWorld() == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
lastLocation = loc;
|
lastLocation = loc;
|
||||||
config.setProperty("lastlocation", loc);
|
config.setProperty("lastlocation", loc);
|
||||||
config.save();
|
config.save();
|
||||||
@@ -787,33 +791,31 @@ public abstract class UserData extends PlayerExtension implements IConf
|
|||||||
config.setProperty("npc", set);
|
config.setProperty("npc", set);
|
||||||
config.save();
|
config.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean arePowerToolsEnabled;
|
private boolean arePowerToolsEnabled;
|
||||||
|
|
||||||
public boolean arePowerToolsEnabled()
|
public boolean arePowerToolsEnabled()
|
||||||
{
|
{
|
||||||
return arePowerToolsEnabled;
|
return arePowerToolsEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPowerToolsEnabled(boolean set)
|
public void setPowerToolsEnabled(boolean set)
|
||||||
{
|
{
|
||||||
arePowerToolsEnabled = set;
|
arePowerToolsEnabled = set;
|
||||||
config.setProperty("powertoolsenabled", set);
|
config.setProperty("powertoolsenabled", set);
|
||||||
config.save();
|
config.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean togglePowerToolsEnabled()
|
public boolean togglePowerToolsEnabled()
|
||||||
{
|
{
|
||||||
boolean ret = !arePowerToolsEnabled();
|
boolean ret = !arePowerToolsEnabled();
|
||||||
setPowerToolsEnabled(ret);
|
setPowerToolsEnabled(ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean _arePowerToolsEnabled()
|
private boolean _arePowerToolsEnabled()
|
||||||
{
|
{
|
||||||
return config.getBoolean("powertoolsenabled", true);
|
return config.getBoolean("powertoolsenabled", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Object> kitTimestamps;
|
private Map<String, Object> kitTimestamps;
|
||||||
|
|
||||||
private Map<String, Object> _getKitTimestamps()
|
private Map<String, Object> _getKitTimestamps()
|
||||||
@@ -842,5 +844,4 @@ public abstract class UserData extends PlayerExtension implements IConf
|
|||||||
config.setProperty("timestamps.kits", kitTimestamps);
|
config.setProperty("timestamps.kits", kitTimestamps);
|
||||||
config.save();
|
config.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user