Some more merge fixes

This commit is contained in:
Sn0wStorm
2019-10-12 14:47:01 +02:00
parent 4a1f606e99
commit d355966d42
4 changed files with 3 additions and 4 deletions
-2
View File
@@ -577,7 +577,6 @@ public class P extends JavaPlugin {
// Third-Party
useWG = config.getBoolean("useWorldGuard", true) && getServer().getPluginManager().isPluginEnabled("WorldGuard");
hasVault = getServer().getPluginManager().isPluginEnabled("Vault");
if (useWG) {
Plugin plugin = Bukkit.getPluginManager().getPlugin("WorldEdit");
@@ -709,7 +708,6 @@ public class P extends JavaPlugin {
FileConfiguration data = YamlConfiguration.loadConfiguration(file);
Brew.installTime = data.getLong("installTime", System.currentTimeMillis());
MCBarrel.mcBarrelTime = data.getLong("MCBarrelTime", 0);
Brew.loadSeed(data);