Fixes Factions Support

This commit is contained in:
Niels Vergucht 2019-01-15 17:00:34 +01:00
parent f44348d0c0
commit 99af79a321
4 changed files with 10 additions and 4 deletions

View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>EpicBuckets</artifactId>
<modelVersion>4.0.0</modelVersion>
<version>1.4.3</version>
<version>1.4.4</version>
<build>
<defaultGoal>clean package</defaultGoal>
<plugins>

View File

@ -96,6 +96,7 @@ public class ConfigManager {
/*
Genbucket
*/
settingsGenbucketIntegers = new HashMap<>();
settingsGenbucketIntegers.put("Cooldown between placements", this::setCooldown);
settingsGenbucketIntegers.put("Sponge radius", this::setSpongeRadius);
settingsGenbucketIntegers.put("Max active gens per player", this::setMaxGenbucketsPerPlayer);
@ -108,6 +109,7 @@ public class ConfigManager {
/*
Genbucket
*/
settingsGenbucketBooleans = new HashMap<>();
settingsGenbucketBooleans.put("Gens in Wilderness", this::setGensInWilderness);
settingsGenbucketBooleans.put("Infinite genbucket use", this::setInfiniteUse);
settingsGenbucketBooleans.put("Charge infinite use placement", this::setChargeInfiniteUse);
@ -118,6 +120,7 @@ public class ConfigManager {
/*
Hooks
*/
settingsHooks = new HashMap<>();
settingsHooks.put("Factions Support", this::setSupportFactions);
settingsHooks.put("Worldguard Support", this::setSupportWorldGuard);
settingsHooks.put("GriefPrevention Support", this::setSupportGriefPrevention);
@ -125,6 +128,7 @@ public class ConfigManager {
/*
Shop
*/
settingsShop = new HashMap<>();
settingsShop.put("Close GUI after purchase", epicBuckets.getShopManager()::setCloseAfterPurchase);
settingsShop.put("Fill bulk shop", epicBuckets.getShopManager()::setBulkFillInventory);
settingsShop.put("Fill shops", this::setFillInventory);

View File

@ -1,6 +1,7 @@
package com.songoda.epicbuckets.regionhandler;
import com.songoda.epicbuckets.EpicBuckets;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
@ -8,8 +9,9 @@ public class RegionFactions {
public static boolean canBuild(Player player, Location location) {
if (!EpicBuckets.getInstance().getConfigManager().isSupportFactions()) return true;
if (!Bukkit.getPluginManager().isPluginEnabled("Factions")) return true;
if (EpicBuckets.getInstance().getDescription().getAuthors().contains("drtshock")) {
if (Bukkit.getPluginManager().getPlugin("Factions").getDescription().getAuthors().contains("drtshock")) {
/*
FactionsUUID and his clones/forks/whatever
*/

View File

@ -1,7 +1,7 @@
name: EpicBuckets
version: 1.4.3
version: 1.4.4
description: Generate walls fast and efficient with beautiful guis!
author: Songoda
main: com.songoda.epicbuckets.EpicBuckets
softdepend: [WorldGuard, WorldEdit, Factions, MassiveCore, FactionsUUID, GriefPrevention]
softdepend: [WorldGuard, WorldEdit, Factions, MassiveCore, GriefPrevention]
depend: [Vault]