Upstream/Brewery
1
0
Fork 1
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2024-11-14 10:15:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some more merge fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/dre/brewery/Barrel.java
View File

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

2
src/com/dre/brewery/Brew.java
View File

@ -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

2
src/com/dre/brewery/P.java
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);

1
src/com/dre/brewery/filedata/DataSave.java
View File

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