From d355966d42e5b5755af7d768cb037b1d583f3d7f Mon Sep 17 00:00:00 2001 From: Sn0wStorm Date: Sat, 12 Oct 2019 14:47:01 +0200 Subject: [PATCH] Some more merge fixes --- src/com/dre/brewery/Barrel.java | 2 +- src/com/dre/brewery/Brew.java | 2 ++ src/com/dre/brewery/P.java | 2 -- src/com/dre/brewery/filedata/DataSave.java | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/dre/brewery/Barrel.java b/src/com/dre/brewery/Barrel.java index c14d447..3f47a8c 100644 --- a/src/com/dre/brewery/Barrel.java +++ b/src/com/dre/brewery/Barrel.java @@ -123,7 +123,7 @@ public class Barrel implements InventoryHolder { // Call event BarrelAccessEvent accessEvent = new BarrelAccessEvent(this, player, event.getClickedBlock()); - // Listened to by WGBarrelNew, WGBarrelOld, GriefPreventionBarrel (IntegrationListener) + // Listened to by WGBarrel7, WGBarrelNew, WGBarrelOld, GriefPreventionBarrel (IntegrationListener) P.p.getServer().getPluginManager().callEvent(accessEvent); if (accessEvent.isCancelled()) { P.p.msg(player, P.p.languageReader.get("Error_NoBarrelAccess")); diff --git a/src/com/dre/brewery/Brew.java b/src/com/dre/brewery/Brew.java index 95c41dc..973e9a8 100644 --- a/src/com/dre/brewery/Brew.java +++ b/src/com/dre/brewery/Brew.java @@ -46,6 +46,7 @@ public class Brew { public Brew(BIngredients ingredients) { this.ingredients = ingredients; + touch(); } // quality already set @@ -53,6 +54,7 @@ public class Brew { this.ingredients = ingredients; this.quality = quality; this.currentRecipe = recipe; + touch(); } // loading with all values set diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index 53098ca..097fc15 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -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); diff --git a/src/com/dre/brewery/filedata/DataSave.java b/src/com/dre/brewery/filedata/DataSave.java index 496bdba..8a63842 100644 --- a/src/com/dre/brewery/filedata/DataSave.java +++ b/src/com/dre/brewery/filedata/DataSave.java @@ -62,7 +62,6 @@ public class DataSave extends BukkitRunnable { FileConfiguration configFile = new YamlConfiguration(); configFile.set("installTime", Brew.installTime); - configFile.set("MCBarrelTime", MCBarrel.mcBarrelTime); Brew.writeSeed(configFile);