From f26efb4cd10515ffd622f6149fdfb7bf6e59977f Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Sat, 20 Jul 2019 00:18:51 +0200 Subject: [PATCH] Update to v2.0.5 --- pom.xml | 2 +- .../pcgamingfreaks/MarriageMaster/Bukkit/Database/Config.java | 4 ---- .../pcgamingfreaks/MarriageMaster/Bukkit/MarriageMaster.java | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2295fb55..31f799cf 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 at.pcgamingfreaks MarriageMaster - 2.0.5-RC4 + 2.0.5 scm:git:git@github.com:GeorgH93/MarriageMaster.git diff --git a/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Database/Config.java b/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Database/Config.java index ba912ddf..5bc02a46 100644 --- a/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Database/Config.java +++ b/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Database/Config.java @@ -27,8 +27,6 @@ import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; -import lombok.Getter; - import java.io.FileNotFoundException; import java.util.Collection; import java.util.HashSet; @@ -37,7 +35,6 @@ public class Config extends Configuration implements DatabaseConfiguration { - @Getter private boolean upgradedFromV1 = false; private static final int CONFIG_VERSION = 93, UPGRADE_THRESHOLD = 93, PRE_V2_VERSIONS = 90; public Config(JavaPlugin plugin) @@ -54,7 +51,6 @@ protected void doUpgrade(at.pcgamingfreaks.YamlFileManager oldConfig) { OldFileUpdater.updateConfig(oldConfig.getYaml(), this.getConfigE()); new UpgradedInfo(MarriageMaster.getInstance()); - upgradedFromV1 = true; } else { diff --git a/src/at/pcgamingfreaks/MarriageMaster/Bukkit/MarriageMaster.java b/src/at/pcgamingfreaks/MarriageMaster/Bukkit/MarriageMaster.java index 153c3304..a40c18c4 100644 --- a/src/at/pcgamingfreaks/MarriageMaster/Bukkit/MarriageMaster.java +++ b/src/at/pcgamingfreaks/MarriageMaster/Bukkit/MarriageMaster.java @@ -117,7 +117,6 @@ public void onEnable() failedToEnablePlugin(); return; } - if(config.isUpgradedFromV1()) config.reload(); if(config.useUpdater()) update(null); // Check for updates language = new Language(this); BackpackIntegrationManager.initIntegration();