diff --git a/javadoc/com/massivecraft/factions/P.html b/javadoc/com/massivecraft/factions/P.html index 215145e7..319fd4f0 100644 --- a/javadoc/com/massivecraft/factions/P.html +++ b/javadoc/com/massivecraft/factions/P.html @@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
{
public CmdAutoHelp() {
- super(SaberFactions.plugin);
+ super(P.p);
this.aliases.add("?");
this.aliases.add("h");
this.aliases.add("help");
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdBan.java b/src/main/java/com/massivecraft/factions/cmd/CmdBan.java
index 6ed521af..94305d1b 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdBan.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdBan.java
@@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.event.FPlayerLeaveEvent;
import com.massivecraft.factions.struct.BanInfo;
import com.massivecraft.factions.struct.Permission;
@@ -81,7 +81,7 @@ public class CmdBan extends FCommand {
if (event.isCancelled()) {
// if someone cancels a ban, we'll get people complaining here. So lets log it.
- SaberFactions.plugin.log(Level.WARNING, "Attempted to ban {0} but someone cancelled the kick event. This isn't good.", target.getName());
+ P.p.log(Level.WARNING, "Attempted to ban {0} but someone cancelled the kick event. This isn't good.", target.getName());
return;
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java b/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java
index 98257813..a52cb6e2 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java
@@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.XMaterial;
import com.massivecraft.factions.zcore.util.TL;
@@ -33,28 +33,28 @@ public class CmdBanner extends FCommand {
@Override
public void perform() {
- if (!SaberFactions.plugin.getConfig().getBoolean("fbanners.Enabled")) {
+ if (!P.p.getConfig().getBoolean("fbanners.Enabled")) {
msg(TL.COMMAND_BANNER_DISABLED);
return;
}
- if (!fme.hasMoney(SaberFactions.plugin.getConfig().getInt("fbanners.Banner-Cost", 5000))) {
+ if (!fme.hasMoney(P.p.getConfig().getInt("fbanners.Banner-Cost", 5000))) {
msg(TL.COMMAND_BANNER_NOTENOUGHMONEY);
return;
}
- takeMoney(fme, SaberFactions.plugin.getConfig().getInt("fbanners.Banner-Cost", 5000));
+ takeMoney(fme, P.p.getConfig().getInt("fbanners.Banner-Cost", 5000));
- //ItemStack warBanner = SaberFactions.plugin.createItem(Material.BANNER, 1, (short) 1, SaberFactions.plugin.getConfig().getString("fbanners.Item.Name"), SaberFactions.plugin.getConfig().getStringList("fbanners.Item.Lore"));
+ //ItemStack warBanner = P.p.createItem(Material.BANNER, 1, (short) 1, P.p.getConfig().getString("fbanners.Item.Name"), P.p.getConfig().getStringList("fbanners.Item.Lore"));
//BannerMeta bannerMeta = (BannerMeta) warBanner.getItemMeta();
ItemStack warBanner = fme.getFaction().getBanner();
if (warBanner != null) {
ItemMeta warmeta = warBanner.getItemMeta();
- warmeta.setDisplayName(SaberFactions.plugin.color(SaberFactions.plugin.getConfig().getString("fbanners.Item.Name")));
- warmeta.setLore(SaberFactions.plugin.colorList(SaberFactions.plugin.getConfig().getStringList("fbanners.Item.Lore")));
+ warmeta.setDisplayName(P.p.color(P.p.getConfig().getString("fbanners.Item.Name")));
+ warmeta.setLore(P.p.colorList(P.p.getConfig().getStringList("fbanners.Item.Lore")));
warBanner.setItemMeta(warmeta);
} else {
- warBanner = SaberFactions.plugin.createItem(XMaterial.BLACK_BANNER.parseMaterial(), 1, (short) 1, SaberFactions.plugin.getConfig().getString("fbanners.Item.Name"), SaberFactions.plugin.getConfig().getStringList("fbanners.Item.Lore"));
+ warBanner = P.p.createItem(XMaterial.BLACK_BANNER.parseMaterial(), 1, (short) 1, P.p.getConfig().getString("fbanners.Item.Name"), P.p.getConfig().getStringList("fbanners.Item.Lore"));
}
fme.msg(TL.COMMAND_BANNER_SUCCESS);
warBanner.setAmount(1);
@@ -63,7 +63,7 @@ public class CmdBanner extends FCommand {
public boolean hasMoney(FPlayer fme, int amt) {
- Economy econ = SaberFactions.plugin.getEcon();
+ Economy econ = P.p.getEcon();
if (econ.getBalance(fme.getPlayer()) >= amt) {
return true;
} else {
@@ -74,7 +74,7 @@ public class CmdBanner extends FCommand {
public void takeMoney(FPlayer fme, int amt) {
if (hasMoney(fme, amt)) {
- Economy econ = SaberFactions.plugin.getEcon();
+ Economy econ = P.p.getEcon();
econ.withdrawPlayer(fme.getPlayer(), amt);
fme.sendMessage(TL.COMMAND_BANNER_MONEYTAKE.toString().replace("{amount}", amt + ""));
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdBypass.java b/src/main/java/com/massivecraft/factions/cmd/CmdBypass.java
index 806fa370..4899eef1 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdBypass.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdBypass.java
@@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
@@ -30,10 +30,10 @@ public class CmdBypass extends FCommand {
// TODO: Move this to a transient field in the model??
if (fme.isAdminBypassing()) {
fme.msg(TL.COMMAND_BYPASS_ENABLE.toString());
- SaberFactions.plugin.log(fme.getName() + TL.COMMAND_BYPASS_ENABLELOG.toString());
+ P.p.log(fme.getName() + TL.COMMAND_BYPASS_ENABLELOG.toString());
} else {
fme.msg(TL.COMMAND_BYPASS_DISABLE.toString());
- SaberFactions.plugin.log(fme.getName() + TL.COMMAND_BYPASS_DISABLELOG.toString());
+ P.p.log(fme.getName() + TL.COMMAND_BYPASS_DISABLELOG.toString());
}
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java b/src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java
index 24479162..1a087d32 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java
@@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
@@ -28,10 +28,10 @@ public class CmdChatSpy extends FCommand {
if (fme.isSpyingChat()) {
fme.msg(TL.COMMAND_CHATSPY_ENABLE);
- SaberFactions.plugin.log(fme.getName() + TL.COMMAND_CHATSPY_ENABLELOG.toString());
+ P.p.log(fme.getName() + TL.COMMAND_CHATSPY_ENABLELOG.toString());
} else {
fme.msg(TL.COMMAND_CHATSPY_DISABLE);
- SaberFactions.plugin.log(fme.getName() + TL.COMMAND_CHATSPY_DISABLELOG.toString());
+ P.p.log(fme.getName() + TL.COMMAND_CHATSPY_DISABLELOG.toString());
}
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java b/src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java
index 2a0effdd..15548424 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java
@@ -26,7 +26,7 @@ public class CmdCheckpoint extends FCommand {
@Override
public void perform() {
- if (!SaberFactions.plugin.getConfig().getBoolean("checkpoints.Enabled")) {
+ if (!P.p.getConfig().getBoolean("checkpoints.Enabled")) {
fme.msg(TL.COMMAND_CHECKPOINT_DISABLED);
return;
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdChest.java b/src/main/java/com/massivecraft/factions/cmd/CmdChest.java
index f9ee33c1..efe418ff 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdChest.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdChest.java
@@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.fperms.Access;
@@ -30,7 +30,7 @@ public class CmdChest extends FCommand {
public void perform() {
- if (!SaberFactions.plugin.getConfig().getBoolean("fchest.Enabled")) {
+ if (!P.p.getConfig().getBoolean("fchest.Enabled")) {
fme.sendMessage("This command is disabled!");
return;
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java b/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java
index f6272f27..0e13e754 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java
@@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;
@@ -231,10 +231,10 @@ public class CmdConfig extends FCommand {
if (!success.isEmpty()) {
if (sender instanceof Player) {
sendMessage(success);
- SaberFactions.plugin.log(success + TL.COMMAND_CONFIG_LOG.format((Player) sender));
- } else // using SaberFactions.plugin.log() instead of sendMessage if run from server console so that "[Factions v#.#.#]" is prepended in server log
+ P.p.log(success + TL.COMMAND_CONFIG_LOG.format((Player) sender));
+ } else // using P.p.log() instead of sendMessage if run from server console so that "[Factions v#.#.#]" is prepended in server log
{
- SaberFactions.plugin.log(success);
+ P.p.log(success);
}
}
// save change to disk
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
index 2bd41afe..22e473c2 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
@@ -97,7 +97,7 @@ public class CmdCreate extends FCommand {
// That way we don't have to mess up deleting more stuff.
// And prevent the user from being returned to NORMAL after deleting his old faction.
fme.setRole(Role.LEADER);
- if (SaberFactions.plugin.getConfig().getBoolean("faction-creation-broadcast", true)) {
+ if (P.p.getConfig().getBoolean("faction-creation-broadcast", true)) {
for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) {
follower.msg(TL.COMMAND_CREATE_CREATED, fme.describeTo(follower, true), faction.getTag(follower));
}
@@ -110,16 +110,16 @@ public class CmdCreate extends FCommand {
if (Conf.logFactionCreate)
- SaberFactions.plugin.log(fme.getName() + TL.COMMAND_CREATE_CREATEDLOG.toString() + tag);
+ P.p.log(fme.getName() + TL.COMMAND_CREATE_CREATEDLOG.toString() + tag);
- if (SaberFactions.plugin.getConfig().getBoolean("fpaypal.Enabled"))
+ if (P.p.getConfig().getBoolean("fpaypal.Enabled"))
this.fme.msg(TL.COMMAND_PAYPALSET_CREATED);
if (Conf.useCustomDefaultPermissions) faction.setDefaultPerms();
if (Conf.usePermissionHints) fme.msg(TL.COMMAND_HINT_PERMISSION);
- fme.setCooldown("create", System.currentTimeMillis() + (SaberFactions.plugin.getConfig().getInt("fcooldowns.f-create") * 1000));
+ fme.setCooldown("create", System.currentTimeMillis() + (P.p.getConfig().getInt("fcooldowns.f-create") * 1000));
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java
index a422fa06..b9605fae 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java
@@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
@@ -35,7 +35,7 @@ public class CmdDelFWarp extends FCommand {
}
private boolean transact(FPlayer player) {
- return !SaberFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SaberFactions.plugin.getConfig().getDouble("warp-cost.delwarp", 5), TL.COMMAND_DELFWARP_TODELETE.toString(), TL.COMMAND_DELFWARP_FORDELETE.toString());
+ return !P.p.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(P.p.getConfig().getDouble("warp-cost.delwarp", 5), TL.COMMAND_DELFWARP_TODELETE.toString(), TL.COMMAND_DELFWARP_FORDELETE.toString());
}
@Override
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
index b815cba2..161474ea 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
@@ -87,15 +87,15 @@ public class CmdDisband extends FCommand {
if ((fme!= null && !disbandMap.containsKey(me.getUniqueId().toString())) && faction.getTnt() > 0) {
msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + ""));
disbandMap.put(me.getUniqueId().toString(), faction.getId());
- Bukkit.getScheduler().scheduleSyncDelayedTask(SaberFactions.plugin, () -> disbandMap.remove(me.getUniqueId().toString()), 200L);
+ Bukkit.getScheduler().scheduleSyncDelayedTask(P.p, () -> disbandMap.remove(me.getUniqueId().toString()), 200L);
} else if (faction.getId().equals(disbandMap.get(me.getUniqueId().toString())) || faction.getTnt() == 0) {
- if (SaberFactions.plugin.getConfig().getBoolean("faction-disband-broadcast", true)) {
+ if (P.p.getConfig().getBoolean("faction-disband-broadcast", true)) {
for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) {
String amountString = senderIsConsole ? TL.GENERIC_SERVERADMIN.toString() : fme.describeTo(follower);
UtilFly.checkFly(this.fme, Board.getInstance().getFactionAt(new FLocation(follower)));
if (follower.getFaction() == faction) {
follower.msg(TL.COMMAND_DISBAND_BROADCAST_YOURS, amountString);
- fme.setCooldown("disband", System.currentTimeMillis() + (SaberFactions.plugin.getConfig().getInt("fcooldowns.f-disband") * 1000));
+ fme.setCooldown("disband", System.currentTimeMillis() + (P.p.getConfig().getInt("fcooldowns.f-disband") * 1000));
} else {
follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
index 2ade1c7a..7cf053c1 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
@@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.WarmUpUtil;
@@ -80,7 +80,7 @@ public class CmdFWarp extends FCommand {
}
private boolean transact(FPlayer player) {
- return !SaberFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(SaberFactions.plugin.getConfig().getDouble("warp-cost.warp", 5), TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString());
+ return !P.p.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(P.p.getConfig().getDouble("warp-cost.warp", 5), TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString());
}
@Override
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
index 67c99272..43a39e9b 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
@@ -39,11 +39,11 @@ public class CmdFly extends FCommand {
public static void startParticles() {
// Just a secondary check.
- if (!SaberFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) {
+ if (!P.p.getConfig().getBoolean("ffly.Particles.Enabled")) {
return;
}
- id = Bukkit.getScheduler().scheduleSyncRepeatingTask(SaberFactions.plugin, () -> {
+ id = Bukkit.getScheduler().scheduleSyncRepeatingTask(P.p, () -> {
for (String name : flyMap.keySet()) {
Player player = Bukkit.getPlayer(name);
if (player == null) {
@@ -52,7 +52,7 @@ public class CmdFly extends FCommand {
if (!player.isFlying()) {
continue;
}
- if (!SaberFactions.plugin.mc17) {
+ if (!P.p.mc17) {
if (player.getGameMode() == GameMode.SPECTATOR) {
continue;
}
@@ -61,12 +61,12 @@ public class CmdFly extends FCommand {
if (FPlayers.getInstance().getByPlayer(player).isVanished()) {
// Actually, vanished players (such as admins) should not display particles to prevent others from knowing their vanished assistance for moderation.
// But we can keep it as a config.
- if (SaberFactions.plugin.getConfig().getBoolean("ffly.Particles.Enable-While-Vanished")) {
+ if (P.p.getConfig().getBoolean("ffly.Particles.Enable-While-Vanished")) {
return;
}
continue;
}
- if (SaberFactions.plugin.useNonPacketParticles) {
+ if (P.p.useNonPacketParticles) {
// 1.9+ based servers will use the built in particleAPI instead of packet based.
// any particle amount higher than 0 made them go everywhere, and the offset at 0 was not working.
// So setting the amount to 0 spawns 1 in the precise location
@@ -84,7 +84,7 @@ public class CmdFly extends FCommand {
}
public static void startFlyCheck() {
- flyid = Bukkit.getScheduler().scheduleSyncRepeatingTask(SaberFactions.plugin, () -> { //threw the exception for now, until I recode fly :( Cringe.
+ flyid = Bukkit.getScheduler().scheduleSyncRepeatingTask(P.p, () -> { //threw the exception for now, until I recode fly :( Cringe.
checkTaskState();
if (flyMap.keySet().size() != 0) {
for (String name : flyMap.keySet()) {
@@ -95,7 +95,7 @@ public class CmdFly extends FCommand {
if (player == null
|| !player.isFlying()
|| player.getGameMode() == GameMode.CREATIVE
- || !SaberFactions.plugin.mc17 && player.getGameMode() == GameMode.SPECTATOR) {
+ || !P.p.mc17 && player.getGameMode() == GameMode.SPECTATOR) {
continue;
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
@@ -171,7 +171,7 @@ public class CmdFly extends FCommand {
@Override
public void perform() {
// Disabled by default.
- if (!SaberFactions.plugin.getConfig().getBoolean("enable-faction-flight", false)) {
+ if (!P.p.getConfig().getBoolean("enable-faction-flight", false)) {
fme.msg(TL.COMMAND_FLY_DISABLED);
return;
}
@@ -212,7 +212,7 @@ public class CmdFly extends FCommand {
fme.setFlying(true);
flyMap.put(player.getName(), true);
if (id == -1) {
- if (SaberFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) {
+ if (P.p.getConfig().getBoolean("ffly.Particles.Enabled")) {
startParticles();
}
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java b/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java
index 90820775..a6e4e4cb 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java
@@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.scoreboards.FTeamWrapper;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
@@ -24,7 +24,7 @@ public class CmdFocus
}
public void perform() {
- if (!SaberFactions.plugin.getConfig().getBoolean("ffocus.Enabled")) {
+ if (!P.p.getConfig().getBoolean("ffocus.Enabled")) {
fme.msg(TL.GENERIC_DISABLED);
return;
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java b/src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java
index ad579870..452adc2d 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java
@@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Location;
@@ -27,12 +27,12 @@ public class CmdGetVault extends FCommand {
@Override
public void perform() {
- if (!SaberFactions.plugin.getConfig().getBoolean("fvault.Enabled")) {
+ if (!P.p.getConfig().getBoolean("fvault.Enabled")) {
fme.sendMessage("This command is disabled!");
return;
}
Location vaultLocation = fme.getFaction().getVault();
- ItemStack vault = SaberFactions.plugin.createItem(Material.CHEST, 1, (short) 0, SaberFactions.plugin.color(SaberFactions.plugin.getConfig().getString("fvault.Item.Name")), SaberFactions.plugin.colorList(SaberFactions.plugin.getConfig().getStringList("fvault.Item.Lore")));
+ ItemStack vault = P.p.createItem(Material.CHEST, 1, (short) 0, P.p.color(P.p.getConfig().getString("fvault.Item.Name")), P.p.colorList(P.p.getConfig().getStringList("fvault.Item.Lore")));
//check if vault is set
@@ -43,7 +43,7 @@ public class CmdGetVault extends FCommand {
//has enough money?
- int amount = SaberFactions.plugin.getConfig().getInt("fvault.Price");
+ int amount = P.p.getConfig().getInt("fvault.Price");
if (!fme.hasMoney(amount)) {
return;
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdGrace.java b/src/main/java/com/massivecraft/factions/cmd/CmdGrace.java
index 2de4c895..ab340b9a 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdGrace.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdGrace.java
@@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
@@ -24,7 +24,7 @@ public class CmdGrace extends FCommand {
@Override
public void perform() {
- if (!SaberFactions.plugin.getConfig().getBoolean("f-grace.Enabled")) {
+ if (!P.p.getConfig().getBoolean("f-grace.Enabled")) {
fme.msg(TL.GENERIC_DISABLED);
return;
}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java
index ca27a175..beda0e84 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java
@@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.P;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
@@ -40,7 +40,7 @@ public class CmdHelp extends FCommand {
@Override
public void perform() {
- if (SaberFactions.plugin.getConfig().getBoolean("use-old-help", true)) {
+ if (P.p.getConfig().getBoolean("use-old-help", true)) {
if (helpPages == null) {
updateHelp();
}
@@ -57,9 +57,9 @@ public class CmdHelp extends FCommand {
sendMessage(helpPages.get(page));
return;
}
- ConfigurationSection help = SaberFactions.plugin.getConfig().getConfigurationSection("help");
+ ConfigurationSection help = P.p.getConfig().getConfigurationSection("help");
if (help == null) {
- help = SaberFactions.plugin.getConfig().createSection("help"); // create new help section
+ help = P.p.getConfig().createSection("help"); // create new help section
List {
public static final SimpleDateFormat sdf = new SimpleDateFormat(TL.DATE_FORMAT.toString());
@@ -31,7 +31,7 @@ public abstract class FCommand extends MCommand