Skip to content

Fix BungeeCord support to use BungeeCord's own GUID #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roblabla wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix BungeeCord support to use BungeeCord's own GUID #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mods/bungee/metrics-lite/src/main/java/org/mcstats/MetricsLite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class MetricsLite {
/**
* Unique server id
*/
private final String guid;
private String guid;

/**
* Debug mode
Expand Down Expand Up @@ -125,15 +125,14 @@ public MetricsLite(Plugin plugin) throws IOException {

configurationFile.createNewFile(); // config file
properties.put("opt-out", "false");
properties.put("guid", UUID.randomUUID().toString());
properties.put("debug", "false");
properties.store(new FileOutputStream(configurationFile), "http://mcstats.org");
} else {
properties.load(new FileInputStream(configurationFile));
}

// Load the guid then
guid = properties.getProperty("guid");
guid = ProxyServer.getInstance().getConfigurationAdapter().getString("stats", UUID.randomUUID().toString());
debug = Boolean.parseBoolean(properties.getProperty("debug"));
}

Expand Down Expand Up @@ -221,7 +220,8 @@ public boolean isOptOut() {
return true;
}

return Boolean.parseBoolean(properties.getProperty("opt-out"));
guid = ProxyServer.getInstance().getConfigurationAdapter().getString("stats", UUID.randomUUID().toString());
return guid.equals("null") || Boolean.parseBoolean(properties.getProperty("opt-out"));
}
}

Expand Down
8 changes: 4 additions & 4 deletions mods/bungee/metrics/src/main/java/org/mcstats/Metrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public class Metrics {
/**
* Unique server id
*/
private final String guid;
private String guid;
/**
* Debug mode
*/
Expand Down Expand Up @@ -141,15 +141,14 @@ public Metrics(final Plugin plugin) throws IOException {

configurationFile.createNewFile(); // config file
properties.put("opt-out", "false");
properties.put("guid", UUID.randomUUID().toString());
properties.put("debug", "false");
properties.store(new FileOutputStream(configurationFile), "http://mcstats.org");
} else {
properties.load(new FileInputStream(configurationFile));
}

// Load the guid then
guid = properties.getProperty("guid");
guid = ProxyServer.getInstance().getConfigurationAdapter().getString("stats", UUID.randomUUID().toString());
debug = Boolean.parseBoolean(properties.getProperty("debug"));
}

Expand Down Expand Up @@ -294,7 +293,8 @@ public boolean isOptOut() {
return true;
}

return Boolean.parseBoolean(properties.getProperty("opt-out"));
guid = ProxyServer.getInstance().getConfigurationAdapter().getString("stats", UUID.randomUUID().toString());
return guid.equals("null") || Boolean.parseBoolean(properties.getProperty("opt-out"));
}
}

Expand Down