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

adjust update messages, pull the actual version into a String for 

dumping to screen.
This commit is contained in:
Nick Minkler 2013-12-24 13:27:46 -08:00
parent c6903d5044
commit c94c85d16b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/net/milkbowl/vault/Vault.java
View File

@ -109,8 +109,10 @@ public class Vault extends JavaPlugin {
private static final Logger log = Logger.getLogger("Minecraft"); private static final Logger log = Logger.getLogger("Minecraft");
private Permission perms; private Permission perms;
private double newVersion; private String newVersionTitle = "";
private double currentVersion; private double newVersion = 0;
private double currentVersion = 0;
private String currentVersionTitle = "";
private ServicesManager sm; private ServicesManager sm;
private Metrics metrics; private Metrics metrics;
@ -123,7 +125,8 @@ public class Vault extends JavaPlugin {
@Override @Override
public void onEnable() { public void onEnable() {
currentVersion = Double.valueOf(getDescription().getVersion().split("-")[0].replaceFirst("\\.", "")); currentVersionTitle = getDescription().getVersion().split("-")[0];
currentVersion = Double.valueOf(currentVersionTitle.replaceFirst("\\.", ""));
sm = getServer().getServicesManager(); sm = getServer().getServicesManager();
// Load Vault Addons // Load Vault Addons
loadEconomy(); loadEconomy();
@ -144,10 +147,10 @@ public class Vault extends JavaPlugin {
newVersion = updateCheck(currentVersion); newVersion = updateCheck(currentVersion);
log.info("Vault version from web: " + newVersion); log.info("Vault version from web: " + newVersion);
if (newVersion > currentVersion) { if (newVersion > currentVersion) {
log.warning("Vault " + newVersion + " is out! You are running: Vault " + currentVersion); log.warning("Vault " + newVersionTitle + " is out! You are running: Vault " + currentVersion);
log.warning("Update Vault at: http://dev.bukkit.org/server-mods/vault"); log.warning("Update Vault at: http://dev.bukkit.org/server-mods/vault");
} else if (currentVersion > newVersion) { } else if (currentVersion > newVersion) {
log.info("It appears you're using an alternate, or development build, happy testing!"); log.info("Vault Stable Version: " + newVersionTitle + " You are on a development or experimental build, Happy testing!");
} else { } else {
log.info("Vault is already up to date, thanks for staying current!"); log.info("Vault is already up to date, thanks for staying current!");
} }
@ -543,8 +546,8 @@ public class Vault extends JavaPlugin {
return currentVersion; return currentVersion;
} }
// Pull the last version from the JSON // Pull the last version from the JSON
String version = ((String) ((JSONObject) array.get(array.size() - 1)).get("name")).replace("Vault", "").replaceFirst("\\.", "").trim(); newVersionTitle = ((String) ((JSONObject) array.get(array.size() - 1)).get("name"));
return Double.valueOf(version); return Double.valueOf(newVersionTitle.replace("Vault", "").replaceFirst("\\.", "").trim());
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
e.printStackTrace(); e.printStackTrace();
} catch (IOException e) { } catch (IOException e) {