TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 03:30:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #217 from jacklin213/bugfix

Browse source 
[BUGFIX] 1.8.0 BETA 2
This commit is contained in:
MistPhizzle 2015-08-23 18:23:36 -05:00
commit c8a5451235
3 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/BendingManager.java
View file

@ -34,7 +34,7 @@ public class BendingManager implements Runnable, ConfigLoadable {
private static String moonriseMessage = config.get().getString("Properties.Water.NightMessage");
private static String fullMoonriseMessage = config.get().getString("Properties.Water.FullMoonMessage");
private static String lunarEclipseMessage = config.get().getString("Properties.Water.LunarEclipsetMessage");
private static String lunarEclipseMessage = config.get().getString("Properties.Water.LunarEclipseMessage");
private static String moonsetMessage = config.get().getString("Properties.Water.DayMessage");
long time;

2
src/com/projectkorra/projectkorra/configuration/ConfigManager.java
View file

@ -138,8 +138,6 @@ public class ConfigManager {
config.addDefault("Properties.RegionProtection.RespectLWC", true);
config.addDefault("Properties.RegionProtection.CacheBlockTime", 5000);
config.addDefault("Properties.TagAPI.Enabled", true);
config.addDefault("Properties.Air.CanBendWithWeapons", false);
config.addDefault("Properties.Air.Particles", "cloud");
config.addDefault("Properties.Air.PlaySound", true);

35
src/com/projectkorra/projectkorra/util/Updater.java
View file

@ -1,5 +1,11 @@
package com.projectkorra.projectkorra.util;
import org.bukkit.plugin.Plugin;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
@ -8,12 +14,6 @@ import java.net.UnknownHostException;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.bukkit.plugin.Plugin;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
/**
* Updater class that takes an rss feed and checks for updates there
* <br>
@ -73,9 +73,9 @@ public class Updater {
*
*/
public void checkUpdate() {
if (getUpdateVersion()==null)
if (getUpdateVersion() == null) {
return;
else if (updateAvailable()) {
} else if (updateAvailable()) {
plugin.getLogger().info("===================[Update Available]===================");
plugin.getLogger().info("You are running version " + getCurrentVersion());
plugin.getLogger().info("The latest version avaliable is " + getUpdateVersion());
@ -90,7 +90,7 @@ public class Updater {
* @return Latest plugin version, or null if it cannot connect
*/
public String getUpdateVersion() {
if (document!=null) {
if (document != null) {
Node latestFile = document.getElementsByTagName("item").item(0);
NodeList children = latestFile.getChildNodes();
@ -107,7 +107,22 @@ public class Updater {
*/
public boolean updateAvailable() {
String updateVersion = getUpdateVersion();
if (updateVersion==null || currentVersion.equalsIgnoreCase(getUpdateVersion())) {
if (updateVersion == null) {
return false;
}
int currentNumber = Integer.parseInt(currentVersion.substring(0, 5).replaceAll("\\.", ""));
int updateNumber = Integer.parseInt(updateVersion.substring(0, 5).replaceAll("\\.", ""));
if (updateNumber == currentNumber) {
if (currentVersion.contains("BETA") && updateVersion.contains("BETA")) {
int currentBeta = Integer.parseInt(currentVersion.substring(currentVersion.lastIndexOf(" ") + 1));
int updateBeta = Integer.parseInt(updateVersion.substring(updateVersion.lastIndexOf(" ") + 1));
if (currentBeta == updateBeta || currentBeta > updateBeta) {
return false;
}
} else if (!currentVersion.contains("BETA") && updateVersion.contains("BETA")) {
return false;
}
} else if (currentVersion.equalsIgnoreCase(updateVersion) || currentNumber > updateNumber) {
return false;
}
return true;