Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2025-02-17 04:11:32 +01:00
Code Issues Projects Releases Wiki Activity

Update to latest PlayerVaultsX API changes. Fixes F vault issues including #1168.

Browse Source
This commit is contained in:
Trent Hensler 2018-12-16 22:14:37 -08:00
parent 8337c6a948
commit 4d523da7e8
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -301,7 +301,7 @@
<dependency>
<groupId>com.drtshock</groupId>
<artifactId>PlayerVaultsX</artifactId>
<version>4.0.4-SNAPSHOT</version>
<version>4.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>

4
src/main/java/com/massivecraft/factions/Conf.java
View File

@ -385,7 +385,7 @@ public class Conf {
static {
baseCommandAliases.add("f");
territoryEnemyDenyCommands.add("home");
/*territoryEnemyDenyCommands.add("home");
territoryEnemyDenyCommands.add("sethome");
territoryEnemyDenyCommands.add("spawn");
territoryEnemyDenyCommands.add("tpahere");
@ -494,7 +494,7 @@ public class Conf {
safeZoneNerfedCreatureTypes.add(EntityType.WITCH);
safeZoneNerfedCreatureTypes.add(EntityType.WITHER);
safeZoneNerfedCreatureTypes.add(EntityType.ZOMBIE);
safeZoneNerfedCreatureTypes.add(EntityType.ELDER_GUARDIAN);
safeZoneNerfedCreatureTypes.add(EntityType.ELDER_GUARDIAN);*/
}
// -------------------------------------------- //

5
src/main/java/com/massivecraft/factions/cmd/CmdVault.java
View File

@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.translations.Lang;
import com.drtshock.playervaults.vaultmanagement.UUIDVaultManager;
import com.drtshock.playervaults.vaultmanagement.VaultManager;
import com.drtshock.playervaults.vaultmanagement.VaultOperations;
import com.drtshock.playervaults.vaultmanagement.VaultViewInfo;
import com.massivecraft.factions.Conf;
@ -54,7 +55,7 @@ public class CmdVault extends FCommand {
if (number < 1) {
// Message about which vaults that Faction has.
// List the target
YamlConfiguration file = UUIDVaultManager.getInstance().getPlayerVaultFile(vaultName);
YamlConfiguration file = VaultManager.getInstance().getPlayerVaultFile(vaultName, false);
if (file == null) {
sender.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString());
} else {
@ -69,7 +70,7 @@ public class CmdVault extends FCommand {
} // end listing vaults.
// Attempt to open vault.
if (VaultOperations.openOtherVault(player, null, String.valueOf(number))) {
if (VaultOperations.openOtherVault(player, vaultName, String.valueOf(number))) {
// Success
PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(vaultName, number));
}