Clean up file accesser

This commit is contained in:
libraryaddict 2020-04-17 14:14:49 +12:00
parent 28a99d91ff
commit cf5a3953d9
No known key found for this signature in database
GPG Key ID: 052E4FBCD257AEA4
3 changed files with 13 additions and 11 deletions

View File

@ -144,6 +144,11 @@ public class LibsDisguises extends JavaPlugin {
new MetricsInitalizer();
}
@Override
public File getFile() {
return super.getFile();
}
@Override
public void onDisable() {
DisguiseUtilities.saveDisguises();

View File

@ -940,9 +940,8 @@ public class DisguiseUtilities {
cachedNames.addAll(Arrays.asList(profileCache.list()));
invalidFile = new File(
LibsDisguises.getInstance().getClass().getProtectionDomain().getCodeSource().getLocation().getFile())
.getName().toLowerCase().matches(".*((crack)|(null)|(leak)).*");
invalidFile = LibsDisguises.getInstance().getFile().getName().toLowerCase()
.matches(".*((crack)|(null)|(leak)).*");
for (String key : savedDisguises.list()) {
try {

View File

@ -64,8 +64,8 @@ public class LibsPremium {
* @param userID
* @return true if userID does not contain __USER__
*/
private static Boolean isPremium(String userID) {
return !userID.contains("__USER__") && !getResourceID().equals("81");
private static Boolean isPremium(String resourceID, String userID) {
return !userID.contains("__USER__") && !resourceID.equals("81");
}
public static Boolean isAPIPlugin() {
@ -76,7 +76,7 @@ public class LibsPremium {
* Returns true if this plugin is premium
*/
public static Boolean isPremium() {
return thisPluginIsPaidFor == null ? isPremium(getUserID()) : thisPluginIsPaidFor;
return thisPluginIsPaidFor == null ? isPremium(getResourceID(), getUserID()) : thisPluginIsPaidFor;
}
/**
@ -142,7 +142,7 @@ public class LibsPremium {
userId = (String) c.getMethod("getUserID").invoke(null);
resourceId = (String) c.getMethod("getResourceID").invoke(null);
downloadId = (String) c.getMethod("getDownloadID").invoke(null);
premium = isPremium(userId);
premium = isPremium(resourceId, userId);
}
String pluginBuildDate = "??/??/????";
@ -306,7 +306,7 @@ public class LibsPremium {
}
pluginInformation = new PluginInformation(getUserID(), getResourceID(), getDownloadID(),
isPremium(getUserID()), version, buildNo, pluginBuildDate);
isPremium(getResourceID(), getUserID()), version, buildNo, pluginBuildDate);
}
if (!isPremium() || !LibsDisguises.getInstance().isReleaseBuild()) {
@ -351,9 +351,7 @@ public class LibsPremium {
}
if (!foundBetter) {
File f = new File(
LibsDisguises.getInstance().getClass().getProtectionDomain().getCodeSource().getLocation()
.getFile());
File f = LibsDisguises.getInstance().getFile();
FileUtil.copy(f, new File(LibsDisguises.getInstance().getDataFolder(), f.getName()));