Some more merge fixes

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"));

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

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);

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);