diff --git a/pom.xml b/pom.xml
index 07c89bca..22618e78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -310,6 +310,11 @@
+
+ com.drtshock
+ PlayerVaults
+ 3.6.0-SNAPSHOT
+
@@ -337,5 +342,9 @@
stealthyone-snapshots
http://repo.stealthyone.com/content/repositories/snapshots/
+
+ playervaults
+ https://ci.drtshock.net/plugin/repository/everything/
+
diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java
index 6fa68888..9e2a6c53 100644
--- a/src/main/java/com/massivecraft/factions/Conf.java
+++ b/src/main/java/com/massivecraft/factions/Conf.java
@@ -356,6 +356,9 @@ public class Conf {
public static Set worldsIgnorePvP = new LinkedHashSet();
public static Set worldsNoWildernessProtection = new LinkedHashSet();
+ // faction-
+ public static String vaultPrefix = "faction-%s";
+
public static Backend backEnd = Backend.JSON;
public static transient int mapHeight = 8;
diff --git a/src/main/java/com/massivecraft/factions/Faction.java b/src/main/java/com/massivecraft/factions/Faction.java
index e8a53a62..5ff09d14 100644
--- a/src/main/java/com/massivecraft/factions/Faction.java
+++ b/src/main/java/com/massivecraft/factions/Faction.java
@@ -27,6 +27,10 @@ public interface Faction extends EconomyParticipator {
public void clearWarps();
+ public int getMaxVaults();
+
+ public void setMaxVaults(int value);
+
public void addAnnouncement(FPlayer fPlayer, String msg);
public void sendUnreadAnnouncements(FPlayer fPlayer);
diff --git a/src/main/java/com/massivecraft/factions/P.java b/src/main/java/com/massivecraft/factions/P.java
index b370d920..17a879cb 100644
--- a/src/main/java/com/massivecraft/factions/P.java
+++ b/src/main/java/com/massivecraft/factions/P.java
@@ -20,6 +20,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.RegisteredServiceProvider;
import java.lang.reflect.Modifier;
@@ -56,6 +57,8 @@ public class P extends MPlugin {
public FCmdRoot cmdBase;
public CmdAutoHelp cmdAutoHelp;
+ private boolean hookedPlayervaults;
+
public P() {
p = this;
}
@@ -71,6 +74,7 @@ public class P extends MPlugin {
// Load Conf from disk
Conf.load();
Essentials.setup();
+ hookedPlayervaults = setupPlayervaults();
FPlayers.getInstance().load();
Factions.getInstance().load();
for (FPlayer fPlayer : FPlayers.getInstance().getAllFPlayers()) {
@@ -128,6 +132,11 @@ public class P extends MPlugin {
return perms != null;
}
+ private boolean setupPlayervaults() {
+ Plugin plugin = getServer().getPluginManager().getPlugin("PlayerVaults");
+ return plugin != null && plugin.isEnabled();
+ }
+
@Override
public GsonBuilder getGsonBuilder() {
Type mapFLocToStringSetType = new TypeToken