Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2024-11-14 10:45:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
GeorgH93 2015-09-30 23:55:31 +02:00
parent 563a260248
commit a7c12782d5
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/config.yml
View File

@ -17,7 +17,7 @@ command_cooldown: -1
# If enabled, it can be disabled for individual players with the "backpack.KeepOnDeath" permission.
drop_on_death: true
# Defines if the message that the backpack has been closed should be shown
show_close_message: true
show_close_message: flase
# Controlls for the auto pickup on full inventory function
full_inventory:

62
src/at/pcgamingfreaks/MinePacks/Database/Config.java
View File

@ -28,7 +28,7 @@
public class Config extends Configuration
{
private static final int CONFIG_VERSION = 9;
public Config(JavaPlugin plugin)
{
super(plugin, CONFIG_VERSION, 9);
@ -37,10 +37,10 @@ public Config(JavaPlugin plugin)
@Override
protected boolean newConfigCreated()
{
config.set("Database.UseUUIDs", plugin.getServer().getOnlineMode() && isBukkitVersionUUIDCompatible());
return !(plugin.getServer().getOnlineMode() && isBukkitVersionUUIDCompatible());
config.set("Database.UseUUIDs", Bukkit.getServer().getOnlineMode() && isBukkitVersionUUIDCompatible());
return !(Bukkit.getServer().getOnlineMode() && isBukkitVersionUUIDCompatible());
}
@Override
protected void doUpdate()
{
@ -48,19 +48,27 @@ protected void doUpdate()
}
@Override
protected void doUpgrade(Configuration oldConfig)
protected void doUpgrade(at.pcgamingfreaks.Configuration oldConfig)
{
Set<String> keys = oldConfig.getConfig().getKeys(true);
Set<String> keys = oldConfig.getConfig().getKeys();
for(String key : keys)
{
if(key.equals("UseUUIDs") || key.equals("Version")) continue;
config.set(key, oldConfig.getConfig().get(key));
if(key.equals("UseUUIDs") || key.equals("Version"))
continue;
try
{
config.set(key, oldConfig.getConfig().getString(key));
}
catch(Exception e)
{
e.printStackTrace();
}
}
if(!oldConfig.getConfig().isSet("Database.UseUUIDs"))
{
if(oldConfig.getConfig().isSet("UseUUIDs"))
{
config.set("Database.UseUUIDs", config.getBoolean("UseUUIDs"));
config.set("Database.UseUUIDs", config.getBoolean("UseUUIDs", true));
}
else
{
@ -74,82 +82,82 @@ public int getAutoCleanupMaxInactiveDays()
{
return config.getInt("Database.AutoCleanup.MaxInactiveDays", -1);
}
public String getDatabaseType()
{
return config.getString("Database.Type", "sqlite");
}
public String getMySQLHost()
{
return config.getString("Database.MySQL.Host", "localhost");
}
public String getMySQLDatabase()
{
return config.getString("Database.MySQL.Database", "minecraft");
}
public String getMySQLUser()
{
return config.getString("Database.MySQL.User", "minecraft");
}
public String getMySQLPassword()
{
return config.getString("Database.MySQL.Password");
return config.getString("Database.MySQL.Password", "");
}
public String getUserTable()
{
return config.getString("Database.Tables.User", "backpack_players");
}
public String getBackpackTable()
{
return config.getString("Database.Tables.Backpack", "backpacks");
}
public String getDBFields(String sub)
{
return config.getString("Database.Tables.Fields." + sub);
return config.getString("Database.Tables.Fields." + sub, "");
}
public boolean getUpdatePlayer()
{
return config.getBoolean("Database.UpdatePlayer", true);
}
public boolean getUseUUIDs()
{
return config.getBoolean("Database.UseUUIDs", true);
}
public boolean getUseUUIDSeparators()
{
return config.getBoolean("Database.UseUUIDSeparators", false);
}
public String getBPTitle()
{
return ChatColor.translateAlternateColorCodes('&', config.getString("BackpackTitle", "%s Backpack"));
}
public boolean getDropOnDeath()
{
return config.getBoolean("drop_on_death", true);
}
public boolean getAutoUpdate()
{
return config.getBoolean("auto-update", true);
}
public int getCommandCooldown()
{
return config.getInt("command_cooldown", -1) * 1000;
}
public boolean getShowCloseMessage()
{
return config.getBoolean("show_close_message", true);