SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code Cleanup/Added Configurable option to deny and remove homes in ANY factions land.

Browse Source 
More Soon..
This commit is contained in:
Driftay 2019-02-10 23:57:45 -05:00
parent 3559a9f090
commit 5a37320397
125 changed files with 3676 additions and 3410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/assembly/package.xml
View File

@ -1,5 +1,5 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>

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

@ -35,7 +35,7 @@ public class Conf {
public static ChatColor colorWar = ChatColor.DARK_RED;
// Power
public static double powerPlayerMax = 10.0;
public static double powerPlayerMin = - 10.0;
public static double powerPlayerMin = -10.0;
public static double powerPlayerStarting = 0.0;
public static double powerPerMinute = 0.2; // Default health rate... it takes 5 min to heal one power
public static double powerPerDeath = 4.0; // A death makes you lose 4 power

2
src/main/java/com/massivecraft/factions/FLocation.java
View File

@ -11,7 +11,7 @@ import java.util.LinkedHashSet;
import java.util.Set;
public class FLocation implements Serializable {
private static final long serialVersionUID = - 8292915234027387983L;
private static final long serialVersionUID = -8292915234027387983L;
private static final boolean worldBorderSupport;
static {

2
src/main/java/com/massivecraft/factions/FPlayer.java
View File

@ -60,7 +60,7 @@ public interface FPlayer extends EconomyParticipator {
/**
* Sets the faction of the FPlayer
*
* @param faction faction to set.
* @param faction faction to set.
*/
void setFaction(Faction faction);

10
src/main/java/com/massivecraft/factions/Faction.java
View File

@ -55,7 +55,7 @@ public interface Faction extends EconomyParticipator {
String getFocused();
void setFocused(String setFocused);
void setFocused(String setFocused);
String getId();
@ -65,9 +65,9 @@ public interface Faction extends EconomyParticipator {
void deinvite(FPlayer fplayer);
void setUpgrade(Upgrade upgrade, int level);
void setUpgrade(Upgrade upgrade, int level);
int getUpgrade(Upgrade upgrade);
int getUpgrade(Upgrade upgrade);
boolean isInvited(FPlayer fplayer);
@ -273,9 +273,9 @@ public interface Faction extends EconomyParticipator {
FPlayer getFPlayerAdmin();
FPlayer getFPlayerLeader();
FPlayer getFPlayerLeader();
ArrayList<FPlayer> getFPlayersWhereRole(Role role);
ArrayList<FPlayer> getFPlayersWhereRole(Role role);
ArrayList<Player> getOnlinePlayers();

6
src/main/java/com/massivecraft/factions/MassiveStats.java
View File

@ -31,7 +31,7 @@ import java.net.URL;
* @author Sam Jakob Harker, Brianna Hazel O'Keefe
* @version 3.0
*/
@SuppressWarnings ("all")
@SuppressWarnings("all")
public class MassiveStats implements Listener {
/* START: MASSIVESTATS SETTINGS */
@ -258,7 +258,7 @@ class MassiveStatsUpdateTask extends BukkitRunnable {
}
@Override
@SuppressWarnings ("all")
@SuppressWarnings("all")
public void run() {
try {
// Generate the request payload and serialize it as JSON.
@ -431,7 +431,7 @@ class MassiveStatsDataRequest {
}
}
@SuppressWarnings ("all")
@SuppressWarnings("all")
public String serialize() {
//return object.toString();
try {

220
src/main/java/com/massivecraft/factions/SavageFactions.java
View File

@ -2,12 +2,12 @@ package com.massivecraft.factions;
import ch.njol.skript.Skript;
import ch.njol.skript.SkriptAddon;
import com.earth2me.essentials.Essentials;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.cmd.CmdAutoHelp;
import com.massivecraft.factions.cmd.FCmdRoot;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.integration.Essentials;
import com.massivecraft.factions.integration.Worldguard;
import com.massivecraft.factions.integration.dynmap.EngineDynmap;
import com.massivecraft.factions.listeners.*;
@ -56,7 +56,9 @@ public class SavageFactions extends MPlugin {
// Single 4 life.
public static SavageFactions plugin;
public static Permission perms = null;
// Persistence related
public static ArrayList<FPlayer> playersFlying = new ArrayList();
public Essentials ess;
public boolean PlaceholderApi;
// Commands
public FCmdRoot cmdBase;
@ -72,15 +74,12 @@ public class SavageFactions extends MPlugin {
SOIL, MOB_SPANWER, THIN_GLASS, IRON_FENCE, NETHER_FENCE, FENCE,
WOODEN_DOOR, TRAP_DOOR, FENCE_GATE, BURNING_FURNACE, DIODE_BLOCK_OFF,
DIODE_BLOCK_ON, ENCHANTMENT_TABLE, FIREBALL;
// Persistence related
SkriptAddon skriptAddon;
private boolean locked = false;
private Integer AutoLeaveTask = null;
private boolean hookedPlayervaults;
private ClipPlaceholderAPIManager clipPlaceholderAPIManager;
private boolean mvdwPlaceholderAPIManager = false;
SkriptAddon skriptAddon;
private Listener[] eventsListener;
public SavageFactions() {
@ -157,7 +156,7 @@ public class SavageFactions extends MPlugin {
// Load Conf from disk
Conf.load();
Essentials.setup();
com.massivecraft.factions.integration.Essentials.setup();
hookedPlayervaults = setupPlayervaults();
FPlayers.getInstance().load();
Factions.getInstance().load();
@ -171,6 +170,11 @@ public class SavageFactions extends MPlugin {
}
faction.addFPlayer(fPlayer);
}
playersFlying.clear();
for (FPlayer fPlayer : FPlayers.getInstance().getAllFPlayers()) {
playersFlying.add(fPlayer);
}
UtilFly.run();
Board.getInstance().load();
Board.getInstance().clean();
@ -206,38 +210,40 @@ public class SavageFactions extends MPlugin {
factionsFlight = true;
}
if (getServer().getPluginManager().getPlugin("Skript") != null) {
log("Skript was found! Registering SavageFactions Addon...");
skriptAddon = Skript.registerAddon(this);
try {
skriptAddon.loadClasses("com.massivecraft.factions.skript", "expressions");
} catch (IOException ex) {
ex.printStackTrace();
}
log("Skript addon registered!");
}
if (getServer().getPluginManager().getPlugin("Skript") != null) {
log("Skript was found! Registering SavageFactions Addon...");
skriptAddon = Skript.registerAddon(this);
try {
skriptAddon.loadClasses("com.massivecraft.factions.skript", "expressions");
} catch (IOException ex) {
ex.printStackTrace();
}
log("Skript addon registered!");
}
// Register Event Handlers
eventsListener = new Listener[] {
new FactionsPlayerListener(),
new FactionsChatListener(),
new FactionsEntityListener(),
new FactionsExploitListener(),
new FactionsBlockListener(),
new FUpgradesGUI(),
new EXPUpgrade(),
new CropUpgrades(),
new SpawnerUpgrades(),
};
eventsListener = new Listener[]{
new FactionsPlayerListener(),
new FactionsChatListener(),
new FactionsEntityListener(),
new FactionsExploitListener(),
new FactionsBlockListener(),
new FUpgradesGUI(),
new EXPUpgrade(),
new CropUpgrades(),
new SpawnerUpgrades(),
};
for (Listener eventListener: eventsListener)
getServer().getPluginManager().registerEvents(eventListener, this);
for (Listener eventListener : eventsListener)
getServer().getPluginManager().registerEvents(eventListener, this);
// since some other plugins execute commands directly through this command interface, provide it
getCommand(this.refCommand).setExecutor(this);
getCommand(this.refCommand).setTabCompleter(this);
setupEssentials();
if (getDescription().getFullName().contains("BETA")) {
divider();
System.out.println("You are using a BETA version of the plugin!");
@ -251,9 +257,9 @@ public class SavageFactions extends MPlugin {
this.loadSuccessful = true;
}
public SkriptAddon getSkriptAddon() {
return skriptAddon;
}
public SkriptAddon getSkriptAddon() {
return skriptAddon;
}
private void setupMultiversionMaterials() {
if (mc113) {
@ -330,35 +336,35 @@ public class SavageFactions extends MPlugin {
}
}
private void migrateFPlayerLeaders() {
List<String> lines = new ArrayList<>();
File fplayerFile = new File("plugins\\Factions\\players.json");
private void migrateFPlayerLeaders() {
List<String> lines = new ArrayList<>();
File fplayerFile = new File("plugins\\Factions\\players.json");
try {
BufferedReader br = new BufferedReader(new FileReader(fplayerFile));
System.out.println("Migrating old players.json file.");
try {
BufferedReader br = new BufferedReader(new FileReader(fplayerFile));
System.out.println("Migrating old players.json file.");
String line;
while ((line = br.readLine()) != null) {
if (line.contains("\"role\": \"ADMIN\"")) {
line = line.replace("\"role\": \"ADMIN\"", "\"role\": " + "\"LEADER\"");
String line;
while ((line = br.readLine()) != null) {
if (line.contains("\"role\": \"ADMIN\"")) {
line = line.replace("\"role\": \"ADMIN\"", "\"role\": " + "\"LEADER\"");
}
lines.add(line);
}
br.close();
BufferedWriter bw = new BufferedWriter(new FileWriter(fplayerFile));
for (String newLine : lines) {
bw.write(newLine + "\n");
}
bw.flush();
bw.close();
} catch (IOException ex) {
System.out.println("File was not found for players.json, assuming"
+ " there is no need to migrate old players.json file.");
}
lines.add(line);
}
br.close();
BufferedWriter bw = new BufferedWriter(new FileWriter(fplayerFile));
for (String newLine : lines) {
bw.write(newLine + "\n");
}
bw.flush();
bw.close();
} catch (IOException ex) {
System.out.println("File was not found for players.json, assuming"
+ " there is no need to migrate old players.json file.");
}
}
public void changeItemIDSInConfig() {
public void changeItemIDSInConfig() {
log("Starting conversion of legacy material in config to 1.13 materials.");
replaceStringInConfig("fperm-gui.relation.materials.recruit", "WOOD_SWORD", "WOODEN_SWORD");
@ -388,8 +394,8 @@ public class SavageFactions extends MPlugin {
public void replaceStringInConfig(String path, String stringToReplace, String replacementString) {
if (getConfig().getString(path).equals(stringToReplace)) {
// SavageFactions.plugin.log("Replacing legacy material '" + stringToReplace + "' with '" + replacementString + "' for config node '" + path + "'.");
// log("Replacing legacy material '" + stringToReplace + "' with '" + replacementString + "' for config node '" + path + "'.");
// SavageFactions.plugin.log("Replacing legacy material '" + stringToReplace + "' with '" + replacementString + "' for config node '" + path + "'.");
// log("Replacing legacy material '" + stringToReplace + "' with '" + replacementString + "' for config node '" + path + "'.");
getConfig().set(path, replacementString);
}
@ -447,10 +453,10 @@ public class SavageFactions extends MPlugin {
public void onDisable() {
// only save data if plugin actually completely loaded successfully
if (this.loadSuccessful) {
// Dont save, as this is kind of pointless, as the /f config command manually saves.
// So any edits done are saved, this way manual edits to json can go through.
// Dont save, as this is kind of pointless, as the /f config command manually saves.
// So any edits done are saved, this way manual edits to json can go through.
// Conf.save();
// Conf.save();
}
if (AutoLeaveTask != null) {
@ -505,6 +511,11 @@ public class SavageFactions extends MPlugin {
return econ;
}
private boolean setupEssentials() {
SavageFactions.plugin.ess = (Essentials) this.getServer().getPluginManager().getPlugin("Essentials");
return SavageFactions.plugin.ess == null;
}
@Override
public boolean logPlayerCommands() {
return Conf.logPlayerCommands;
@ -528,55 +539,50 @@ public class SavageFactions extends MPlugin {
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
FPlayer fPlayer = FPlayers.getInstance().getByPlayer((Player) sender);
List<String> completions = new ArrayList<>();
String cmd = Conf.baseCommandAliases.isEmpty() ? "/f" : "/" + Conf.baseCommandAliases.get(0);
List<String> argsList = new ArrayList<>(Arrays.asList(args));
argsList.remove(argsList.size() - 1);
String cmdValid = (cmd + " " + TextUtil.implode(argsList, " ")).trim();
MCommand<?> commandEx = cmdBase;
List<MCommand<?>> commandsList = cmdBase.subCommands;
FPlayer fPlayer = FPlayers.getInstance().getByPlayer((Player) sender);
List<String> completions = new ArrayList<>();
String cmd = Conf.baseCommandAliases.isEmpty() ? "/f" : "/" + Conf.baseCommandAliases.get(0);
List<String> argsList = new ArrayList<>(Arrays.asList(args));
argsList.remove(argsList.size() - 1);
String cmdValid = (cmd + " " + TextUtil.implode(argsList, " ")).trim();
MCommand<?> commandEx = cmdBase;
List<MCommand<?>> commandsList = cmdBase.subCommands;
if (Board.getInstance().getFactionAt(new FLocation(fPlayer.getPlayer().getLocation())) == Factions.getInstance().getWarZone()) {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&cYou cannot use autocomplete in warzone."));
return new ArrayList<>();
if (Board.getInstance().getFactionAt(new FLocation(fPlayer.getPlayer().getLocation())) == Factions.getInstance().getWarZone()) {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&cYou cannot use autocomplete in warzone."));
return new ArrayList<>();
}
for (; !commandsList.isEmpty() && !argsList.isEmpty(); argsList.remove(0))
{
String cmdName = argsList.get(0).toLowerCase();
MCommand<?> commandFounded = commandsList.stream()
.filter(c -> c.aliases.contains(cmdName))
.findFirst().orElse(null);
for (; !commandsList.isEmpty() && !argsList.isEmpty(); argsList.remove(0)) {
String cmdName = argsList.get(0).toLowerCase();
MCommand<?> commandFounded = commandsList.stream()
.filter(c -> c.aliases.contains(cmdName))
.findFirst().orElse(null);
if (commandFounded != null)
{
commandEx = commandFounded;
commandsList = commandFounded.subCommands;
}
else break;
}
if (commandFounded != null) {
commandEx = commandFounded;
commandsList = commandFounded.subCommands;
} else break;
}
if (argsList.isEmpty())
{
for (MCommand<?> subCommand: commandEx.subCommands)
{
subCommand.setCommandSender(sender);
if (handleCommand(sender, cmdValid + " " + subCommand.aliases.get(0), true)
&& subCommand.visibility != CommandVisibility.INVISIBLE
&& subCommand.validSenderType(sender, false)
&& subCommand.validSenderPermissions(sender, false))
completions.addAll(subCommand.aliases);
}
}
if (argsList.isEmpty()) {
for (MCommand<?> subCommand : commandEx.subCommands) {
subCommand.setCommandSender(sender);
if (handleCommand(sender, cmdValid + " " + subCommand.aliases.get(0), true)
&& subCommand.visibility != CommandVisibility.INVISIBLE
&& subCommand.validSenderType(sender, false)
&& subCommand.validSenderPermissions(sender, false))
completions.addAll(subCommand.aliases);
}
}
String lastArg = args[args.length - 1].toLowerCase();
String lastArg = args[args.length - 1].toLowerCase();
completions = completions.stream()
.filter(m -> m.toLowerCase().startsWith(lastArg))
.collect(Collectors.toList());
completions = completions.stream()
.filter(m -> m.toLowerCase().startsWith(lastArg))
.collect(Collectors.toList());
return completions;
return completions;
}
public void createTimedHologram(final Location location, String text, Long timeout) {
@ -589,10 +595,10 @@ public class SavageFactions extends MPlugin {
final ArmorStand armorStand = as;
Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, () -> {
armorStand.remove();
getLogger().info("Removing Hologram.");
}
, timeout * 20);
armorStand.remove();
getLogger().info("Removing Hologram.");
}
, timeout * 20);
}

2
src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java
View File

@ -25,7 +25,7 @@ public class CmdAdmin extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = false;
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdBanner.java
View File

@ -23,7 +23,7 @@ public class CmdBanner extends FCommand {
this.disableOnLock = false;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = true;

33
src/main/java/com/massivecraft/factions/cmd/CmdChat.java
View File

@ -41,12 +41,10 @@ public class CmdChat extends FCommand {
modeString = modeString.toLowerCase();
// Only allow Mods and higher rank to switch to this channel.
if (modeString.startsWith("m")) {
if (!fme.getRole().isAtLeast(Role.MODERATOR))
{
msg(TL.COMMAND_CHAT_MOD_ONLY);
return;
}
else modeTarget = ChatMode.MOD;
if (!fme.getRole().isAtLeast(Role.MODERATOR)) {
msg(TL.COMMAND_CHAT_MOD_ONLY);
return;
} else modeTarget = ChatMode.MOD;
} else if (modeString.startsWith("p")) {
modeTarget = ChatMode.PUBLIC;
} else if (modeString.startsWith("a")) {
@ -63,13 +61,22 @@ public class CmdChat extends FCommand {
fme.setChatMode(modeTarget);
switch (fme.getChatMode())
{
case MOD: msg(TL.COMMAND_CHAT_MODE_MOD); break;
case PUBLIC: msg(TL.COMMAND_CHAT_MODE_PUBLIC); break;
case ALLIANCE: msg(TL.COMMAND_CHAT_MODE_ALLIANCE); break;
case TRUCE: msg(TL.COMMAND_CHAT_MODE_TRUCE); break;
default: msg(TL.COMMAND_CHAT_MODE_FACTION); break;
switch (fme.getChatMode()) {
case MOD:
msg(TL.COMMAND_CHAT_MODE_MOD);
break;
case PUBLIC:
msg(TL.COMMAND_CHAT_MODE_PUBLIC);
break;
case ALLIANCE:
msg(TL.COMMAND_CHAT_MODE_ALLIANCE);
break;
case TRUCE:
msg(TL.COMMAND_CHAT_MODE_TRUCE);
break;
default:
msg(TL.COMMAND_CHAT_MODE_FACTION);
break;
}
}

2
src/main/java/com/massivecraft/factions/cmd/CmdChest.java
View File

@ -20,7 +20,7 @@ public class CmdChest extends FCommand {
this.disableOnLock = false;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeAdmin = false;

9
src/main/java/com/massivecraft/factions/cmd/CmdClaim.java
View File

@ -46,11 +46,10 @@ public class CmdClaim extends FCommand {
}
}
if (forFaction.isWilderness())
{
CmdUnclaim cmdUnclaim = SavageFactions.plugin.cmdBase.cmdUnclaim;
cmdUnclaim.execute(sender, args.size() > 1 ? args.subList(0, 1):args);
return;
if (forFaction.isWilderness()) {
CmdUnclaim cmdUnclaim = SavageFactions.plugin.cmdBase.cmdUnclaim;
cmdUnclaim.execute(sender, args.size() > 1 ? args.subList(0, 1) : args);
return;
}
if (radius < 1) {

2
src/main/java/com/massivecraft/factions/cmd/CmdClaimAt.java
View File

@ -18,7 +18,7 @@ public class CmdClaimAt extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdClaimLine.java
View File

@ -26,7 +26,7 @@ public class CmdClaimLine extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdColeader.java
View File

@ -24,7 +24,7 @@ public class CmdColeader extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = false;
senderMustBePlayer = false;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeAdmin = true;

4
src/main/java/com/massivecraft/factions/cmd/CmdConfig.java
View File

@ -174,7 +174,7 @@ public class CmdConfig extends FCommand {
return;
}
@SuppressWarnings ("unchecked") Set<Material> matSet = (Set<Material>) target.get(null);
@SuppressWarnings("unchecked") Set<Material> matSet = (Set<Material>) target.get(null);
// Material already present, so remove it
if (matSet.contains(newMat)) {
@ -192,7 +192,7 @@ public class CmdConfig extends FCommand {
// Set<String>
else if (innerType == String.class) {
@SuppressWarnings ("unchecked") Set<String> stringSet = (Set<String>) target.get(null);
@SuppressWarnings("unchecked") Set<String> stringSet = (Set<String>) target.get(null);
// String already present, so remove it
if (stringSet.contains(value.toString())) {

2
src/main/java/com/massivecraft/factions/cmd/CmdCoords.java
View File

@ -16,7 +16,7 @@ public class CmdCoords extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java
View File

@ -25,7 +25,7 @@ public class CmdDeinvite extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdDemote.java
View File

@ -4,6 +4,6 @@ public class CmdDemote extends FPromoteCommand {
public CmdDemote() {
aliases.add("demote");
this.relative = - 1;
this.relative = -1;
}
}

2
src/main/java/com/massivecraft/factions/cmd/CmdDescription.java
View File

@ -22,7 +22,7 @@ public class CmdDescription extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = true;

7
src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
View File

@ -1,12 +1,10 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions;
import com.massivecraft.factions.*;
import com.massivecraft.factions.event.FactionDisbandEvent.PlayerDisbandReason;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.UtilFly;
import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.util.TL;
@ -93,6 +91,7 @@ public class CmdDisband extends FCommand {
if (SavageFactions.plugin.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);
} else {

2
src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
View File

@ -24,7 +24,7 @@ public class CmdFWarp extends FCommand {
this.optionalArgs.put("password", "password");
this.permission = Permission.WARP.node;
this.permission = Permission.WARP.node;
this.senderMustBeMember = true;
this.senderMustBeModerator = false;
}

20
src/main/java/com/massivecraft/factions/cmd/CmdFly.java
View File

@ -23,8 +23,8 @@ public class CmdFly extends FCommand {
public static ConcurrentHashMap<String, Boolean> flyMap = new ConcurrentHashMap<String, Boolean>();
public static int id = - 1;
public static int flyid = - 1;
public static int id = -1;
public static int flyid = -1;
public CmdFly() {
super();
@ -33,7 +33,7 @@ public class CmdFly extends FCommand {
this.optionalArgs.put("on/off", "flip");
this.permission = Permission.FLY.node;
this.permission = Permission.FLY.node;
this.senderMustBeMember = true;
this.senderMustBeModerator = false;
}
@ -73,15 +73,15 @@ public class CmdFly extends FCommand {
// 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
player.getWorld().spawnParticle(Particle.CLOUD, player.getLocation().add(0, - 0.35, 0), 0);
player.getWorld().spawnParticle(Particle.CLOUD, player.getLocation().add(0, -0.35, 0), 0);
} else {
ParticleEffect.CLOUD.display((float) 0, (float) 0, (float) 0, (float) 0, 3, player.getLocation().add(0, - 0.35, 0), 16);
ParticleEffect.CLOUD.display((float) 0, (float) 0, (float) 0, (float) 0, 3, player.getLocation().add(0, -0.35, 0), 16);
}
}
if (flyMap.keySet().size() == 0) {
Bukkit.getScheduler().cancelTask(id);
id = - 1;
id = -1;
}
}
}, 10L, 3L);
@ -178,7 +178,7 @@ public class CmdFly extends FCommand {
public static void checkTaskState() {
if (flyMap.keySet().size() == 0) {
Bukkit.getScheduler().cancelTask(flyid);
flyid = - 1;
flyid = -1;
}
}
@ -199,7 +199,7 @@ public class CmdFly extends FCommand {
if (!checkBypassPerms(fme, me, toFac)) return;
List<Entity> entities = this.me.getNearbyEntities(16.0D, 256.0D, 16.0D);
for (int i = 0; i <= entities.size() - 1; ++ i) {
for (int i = 0; i <= entities.size() - 1; ++i) {
if (entities.get(i) instanceof Player) {
Player eplayer = (Player) entities.get(i);
FPlayer efplayer = FPlayers.getInstance().getByPlayer(eplayer);
@ -231,12 +231,12 @@ public class CmdFly extends FCommand {
public void run() {
fme.setFlying(true);
flyMap.put(player.getName(), true);
if (id == - 1) {
if (id == -1) {
if (SavageFactions.plugin.getConfig().getBoolean("ffly.Particles.Enabled")) {
startParticles();
}
}
if (flyid == - 1) {
if (flyid == -1) {
startFlyCheck();
}
}

16
src/main/java/com/massivecraft/factions/cmd/CmdFocus.java
View File

@ -9,18 +9,18 @@ import com.massivecraft.factions.zcore.util.TL;
public class CmdFocus
extends FCommand {
public CmdFocus() {
aliases.add("focus");
aliases.add("focus");
requiredArgs.add("player");
requiredArgs.add("player");
permission = Permission.FOCUS.node;
permission = Permission.FOCUS.node;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeColeader = false;
senderMustBeAdmin = false;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeColeader = false;
senderMustBeAdmin = false;
}
public void perform() {

2
src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java
View File

@ -18,7 +18,7 @@ public class CmdGetVault extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdHome.java
View File

@ -31,7 +31,7 @@ public class CmdHome extends FCommand {
this.disableOnLock = false;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdInspect.java
View File

@ -13,7 +13,7 @@ public class CmdInspect extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdInvite.java
View File

@ -24,7 +24,7 @@ public class CmdInvite extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdJoin.java
View File

@ -19,7 +19,7 @@ public class CmdJoin extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdKick.java
View File

@ -27,7 +27,7 @@ public class CmdKick extends FCommand {
this.disableOnLock = false;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdLeave.java
View File

@ -16,7 +16,7 @@ public class CmdLeave extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = false;

4
src/main/java/com/massivecraft/factions/cmd/CmdList.java
View File

@ -70,7 +70,7 @@ public class CmdList extends FCommand {
if (f1Size < f2Size) {
return 1;
} else if (f1Size > f2Size) {
return - 1;
return -1;
}
return 0;
}
@ -85,7 +85,7 @@ public class CmdList extends FCommand {
if (f1Size < f2Size) {
return 1;
} else if (f1Size > f2Size) {
return - 1;
return -1;
}
return 0;
}

2
src/main/java/com/massivecraft/factions/cmd/CmdLock.java
View File

@ -23,7 +23,7 @@ public class CmdLock extends FCommand {
this.disableOnLock = false;
senderMustBePlayer = false;
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdLogins.java
View File

@ -13,7 +13,7 @@ public class CmdLogins extends FCommand {
this.aliases.add("logouts");
this.senderMustBePlayer = true;
this.senderMustBeMember = true;
this.senderMustBeMember = true;
this.permission = Permission.MONITOR_LOGINS.node;
}

2
src/main/java/com/massivecraft/factions/cmd/CmdLowPower.java
View File

@ -15,7 +15,7 @@ public class CmdLowPower extends FCommand {
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = true;
senderMustBeAdmin = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdMap.java
View File

@ -20,7 +20,7 @@ public class CmdMap extends FCommand {
this.disableOnLock = false;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdMapHeight.java
View File

@ -16,7 +16,7 @@ public class CmdMapHeight extends FCommand {
this.permission = Permission.MAPHEIGHT.node;
this.senderMustBePlayer = true;
this.senderMustBePlayer = true;
}
@Override

2
src/main/java/com/massivecraft/factions/cmd/CmdMod.java
View File

@ -25,7 +25,7 @@ public class CmdMod extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = false;
senderMustBePlayer = false;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = true;

2
src/main/java/com/massivecraft/factions/cmd/CmdMoneyBalance.java
View File

@ -19,7 +19,7 @@ public class CmdMoneyBalance extends FCommand {
this.setHelpShort(TL.COMMAND_MONEYBALANCE_SHORT.toString());
senderMustBePlayer = false;
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java
View File

@ -22,7 +22,7 @@ public class CmdMoneyDeposit extends FCommand {
this.permission = Permission.MONEY_DEPOSIT.node;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java
View File

@ -24,7 +24,7 @@ public class CmdMoneyTransferFf extends FCommand {
this.permission = Permission.MONEY_F2F.node;
senderMustBePlayer = false;
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java
View File

@ -23,7 +23,7 @@ public class CmdMoneyTransferFp extends FCommand {
this.permission = Permission.MONEY_F2P.node;
senderMustBePlayer = false;
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java
View File

@ -23,7 +23,7 @@ public class CmdMoneyTransferPf extends FCommand {
this.permission = Permission.MONEY_P2F.node;
senderMustBePlayer = false;
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java
View File

@ -23,7 +23,7 @@ public class CmdMoneyWithdraw extends FCommand {
this.permission = Permission.MONEY_WITHDRAW.node;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdNear.java
View File

@ -17,7 +17,7 @@ public class CmdNear extends FCommand {
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeColeader = false;

2
src/main/java/com/massivecraft/factions/cmd/CmdOpen.java
View File

@ -19,7 +19,7 @@ public class CmdOpen extends FCommand {
this.disableOnLock = false;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = true;

2
src/main/java/com/massivecraft/factions/cmd/CmdOwnerList.java
View File

@ -20,7 +20,7 @@ public class CmdOwnerList extends FCommand {
this.disableOnLock = false;
senderMustBePlayer = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeColeader = false;

6
src/main/java/com/massivecraft/factions/cmd/CmdReload.java
View File

@ -26,9 +26,9 @@ public class CmdReload extends FCommand {
public void perform() {
long timeInitStart = System.currentTimeMillis();
Conf.load();
Conf.save();
SavageFactions.plugin.reloadConfig();
SavageFactions.plugin.changeItemIDSInConfig();
Conf.save();
SavageFactions.plugin.reloadConfig();
SavageFactions.plugin.changeItemIDSInConfig();
SavageFactions.plugin.loadLang();
int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]);

6
src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java
View File

@ -21,7 +21,7 @@ public class CmdSeeChunk extends FCommand {
private boolean useParticles;
private int length;
private ParticleEffect effect;
private int taskID = - 1;
private int taskID = -1;
//I remade it cause of people getting mad that I had the same seechunk as drtshock
@ -61,10 +61,10 @@ public class CmdSeeChunk extends FCommand {
}
private void manageTask() {
if (taskID != - 1) {
if (taskID != -1) {
if (seeChunkMap.keySet().size() == 0) {
Bukkit.getScheduler().cancelTask(taskID);
taskID = - 1;
taskID = -1;
}
} else {
startTask();

2
src/main/java/com/massivecraft/factions/cmd/CmdSetDefaultRole.java
View File

@ -20,7 +20,7 @@ public class CmdSetDefaultRole extends FCommand {
senderMustBeColeader = false;
this.permission = Permission.DEFAULTRANK.node;
this.permission = Permission.DEFAULTRANK.node;
}
@Override

2
src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java
View File

@ -24,7 +24,7 @@ public class CmdSetFWarp extends FCommand {
this.senderMustBeMember = true;
this.senderMustBeModerator = false;
this.senderMustBePlayer = true;
this.senderMustBePlayer = true;
this.permission = Permission.SETWARP.node;
}

2
src/main/java/com/massivecraft/factions/cmd/CmdSetMaxVaults.java
View File

@ -28,7 +28,7 @@ public class CmdSetMaxVaults extends FCommand {
@Override
public void perform() {
Faction targetFaction = argAsFaction(0);
int value = argAsInt(1, - 1);
int value = argAsInt(1, -1);
if (value < 0) {
sender.sendMessage(ChatColor.RED + "Number must be greater than 0.");
return;

3
src/main/java/com/massivecraft/factions/cmd/CmdShowClaims.java
View File

@ -21,7 +21,6 @@ public class CmdShowClaims extends FCommand {
this.senderMustBePlayer = true;
}
@Override
@ -35,7 +34,7 @@ public class CmdShowClaims extends FCommand {
for (String world : chunkMap.keySet()) {
String message = TL.COMMAND_SHOWCLAIMS_FORMAT.toString().replace("{world}", world);
sendMessage(message.replace("{chunks}", "")); // made {chunks} blank as I removed the placeholder and people wont update their config :shrug:
StringBuilder chunks = new StringBuilder();
StringBuilder chunks = new StringBuilder();
for (String chunkString : chunkMap.get(world)) {
chunks.append(chunkString + ", ");
if (chunks.toString().length() >= 2000) {

2
src/main/java/com/massivecraft/factions/cmd/CmdStatus.java
View File

@ -30,7 +30,7 @@ public class CmdStatus extends FCommand {
for (FPlayer fp : myFaction.getFPlayers()) {
String humanized = DurationFormatUtils.formatDurationWords(System.currentTimeMillis() - fp.getLastLoginTime(), true, true) + TL.COMMAND_STATUS_AGOSUFFIX;
String last = fp.isOnline() ? ChatColor.GREEN + TL.COMMAND_STATUS_ONLINE.toString() : (System.currentTimeMillis() - fp.getLastLoginTime() < 432000000 ? ChatColor.YELLOW + humanized : ChatColor.RED + humanized);
String power = ChatColor.YELLOW + String.valueOf(fp.getPowerRounded()) + " / " + fp.getPowerMaxRounded() + ChatColor.RESET;
String power = ChatColor.YELLOW + String.valueOf(fp.getPowerRounded()) + " / " + fp.getPowerMaxRounded() + ChatColor.RESET;
ret.add(String.format(TL.COMMAND_STATUS_FORMAT.toString(), ChatColor.GOLD + fp.getRole().getPrefix() + fp.getName() + ChatColor.RESET, power, last).trim());
}
fme.sendMessage(ret);

2
src/main/java/com/massivecraft/factions/cmd/CmdTnt.java
View File

@ -99,7 +99,7 @@ public class CmdTnt extends FCommand {
return;
}
if (fme.getFaction().getTnt() < amount) {
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString());
return;
}
int fullStacks = amount / 64;

14
src/main/java/com/massivecraft/factions/cmd/CmdTop.java
View File

@ -34,7 +34,7 @@ public class CmdTop extends FCommand {
}
@Override
@Override
public void perform() {
// Can sort by: money, members, online, allies, enemies, power, land.
// Get all Factions and remove non player ones.
@ -55,7 +55,7 @@ public class CmdTop extends FCommand {
if (f1Size < f2Size) {
return 1;
} else if (f1Size > f2Size) {
return - 1;
return -1;
}
return 0;
}
@ -70,7 +70,7 @@ public class CmdTop extends FCommand {
if (f1start > f2start) {
return 1;
} else if (f1start < f2start) {
return - 1;
return -1;
}
return 0;
}
@ -84,7 +84,7 @@ public class CmdTop extends FCommand {
if (f1Size < f2Size) {
return 1;
} else if (f1Size > f2Size) {
return - 1;
return -1;
}
return 0;
}
@ -98,7 +98,7 @@ public class CmdTop extends FCommand {
if (f1Size < f2Size) {
return 1;
} else if (f1Size > f2Size) {
return - 1;
return -1;
}
return 0;
}
@ -112,7 +112,7 @@ public class CmdTop extends FCommand {
if (f1Size < f2Size) {
return 1;
} else if (f1Size > f2Size) {
return - 1;
return -1;
}
return 0;
}
@ -133,7 +133,7 @@ public class CmdTop extends FCommand {
if (f1Size < f2Size) {
return 1;
} else if (f1Size > f2Size) {
return - 1;
return -1;
}
return 0;
}

2
src/main/java/com/massivecraft/factions/cmd/CmdUnban.java
View File

@ -22,7 +22,7 @@ public class CmdUnban extends FCommand {
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeAdmin = false;
}
@Override

11
src/main/java/com/massivecraft/factions/cmd/FCommand.java
View File

@ -45,10 +45,9 @@ public abstract class FCommand extends MCommand<SavageFactions> {
}
@Override
public void setCommandSender(CommandSender sender)
{
super.setCommandSender(sender);
if (sender instanceof Player) {
public void setCommandSender(CommandSender sender) {
super.setCommandSender(sender);
if (sender instanceof Player) {
this.fme = FPlayers.getInstance().getByPlayer((Player) sender);
this.myFaction = this.fme.getFaction();
} else {
@ -312,9 +311,9 @@ public abstract class FCommand extends MCommand<SavageFactions> {
}
if (Conf.bankEnabled && Conf.bankFactionPaysCosts && fme.hasFaction()) {
return Econ.modifyMoney(myFaction, - cost, toDoThis, forDoingThis);
return Econ.modifyMoney(myFaction, -cost, toDoThis, forDoingThis);
} else {
return Econ.modifyMoney(fme, - cost, toDoThis, forDoingThis);
return Econ.modifyMoney(fme, -cost, toDoThis, forDoingThis);
}
}

2
src/main/java/com/massivecraft/factions/cmd/FPromoteCommand.java
View File

@ -39,7 +39,7 @@ public class FPromoteCommand extends FCommand {
}
Role current = target.getRole();
Role promotion = Role.getRelative(current, + relative);
Role promotion = Role.getRelative(current, +relative);
// Now it ain't that messy
if (!fme.isAdminBypassing()) {

4
src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java
View File

@ -103,9 +103,9 @@ public abstract class FRelationCommand extends FCommand {
}
private boolean hasMaxRelations(Faction them, Relation targetRelation) {
int max = SavageFactions.plugin.getConfig().getInt("max-relations." + targetRelation.toString(), - 1);
int max = SavageFactions.plugin.getConfig().getInt("max-relations." + targetRelation.toString(), -1);
if (SavageFactions.plugin.getConfig().getBoolean("max-relations.enabled", false)) {
if (max != - 1) {
if (max != -1) {
if (myFaction.getRelationCount(targetRelation) >= max) {
msg(TL.COMMAND_RELATIONS_EXCEEDS_ME, max, targetRelation.getPluralTranslation());
return true;

8
src/main/java/com/massivecraft/factions/event/FactionDisbandEvent.java
View File

@ -11,9 +11,9 @@ import org.bukkit.event.Cancellable;
*/
public class FactionDisbandEvent extends FactionEvent implements Cancellable {
private boolean cancelled = false;
private final Player sender;
private final PlayerDisbandReason reason;
private boolean cancelled = false;
public FactionDisbandEvent(Player sender, String factionId, PlayerDisbandReason reason) {
super(Factions.getInstance().getFactionById(factionId));
@ -30,10 +30,10 @@ public class FactionDisbandEvent extends FactionEvent implements Cancellable {
}
public PlayerDisbandReason getReason() {
return reason;
}
return reason;
}
@Override
@Override
public boolean isCancelled() {
return cancelled;
}

3
src/main/java/com/massivecraft/factions/event/PowerRegenEvent.java
View File

@ -1,9 +1,8 @@
package com.massivecraft.factions.event;
import org.bukkit.event.Cancellable;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import org.bukkit.event.Cancellable;
/**
* Event called when a player regenerate power.

6
src/main/java/com/massivecraft/factions/iface/EconomyParticipator.java
View File

@ -4,9 +4,9 @@ import com.massivecraft.factions.zcore.util.TL;
public interface EconomyParticipator extends RelationParticipator {
public String getAccountId();
String getAccountId();
public void msg(String str, Object... args);
void msg(String str, Object... args);
public void msg(TL translation, Object... args);
void msg(TL translation, Object... args);
}

10
src/main/java/com/massivecraft/factions/iface/RelationParticipator.java
View File

@ -5,13 +5,13 @@ import org.bukkit.ChatColor;
public interface RelationParticipator {
public String describeTo(RelationParticipator that);
String describeTo(RelationParticipator that);
public String describeTo(RelationParticipator that, boolean ucfirst);
String describeTo(RelationParticipator that, boolean ucfirst);
public Relation getRelationTo(RelationParticipator that);
Relation getRelationTo(RelationParticipator that);
public Relation getRelationTo(RelationParticipator that, boolean ignorePeaceful);
Relation getRelationTo(RelationParticipator that, boolean ignorePeaceful);
public ChatColor getColorTo(RelationParticipator to);
ChatColor getColorTo(RelationParticipator to);
}

14
src/main/java/com/massivecraft/factions/integration/Econ.java
View File

@ -141,7 +141,7 @@ public class Econ {
// The amount must be positive.
// If the amount is negative we must flip and multiply amount with -1.
if (amount < 0) {
amount *= - 1;
amount *= -1;
EconomyParticipator temp = from;
from = to;
to = temp;
@ -308,7 +308,7 @@ public class Econ {
// The account might not have enough space
EconomyResponse er = econ.depositPlayer(acc, delta);
if (er.transactionSuccess()) {
modifyUniverseMoney(- delta);
modifyUniverseMoney(-delta);
if (forDoingThis != null && !forDoingThis.isEmpty()) {
ep.msg("<h>%s<i> gained <h>%s<i> %s.", You, moneyString(delta), forDoingThis);
}
@ -324,17 +324,17 @@ public class Econ {
// The player should loose money
// The player might not have enough.
if (econ.has(acc, - delta) && econ.withdrawPlayer(acc, - delta).transactionSuccess()) {
if (econ.has(acc, -delta) && econ.withdrawPlayer(acc, -delta).transactionSuccess()) {
// There is enough money to pay
modifyUniverseMoney(- delta);
modifyUniverseMoney(-delta);
if (forDoingThis != null && !forDoingThis.isEmpty()) {
ep.msg("<h>%s<i> lost <h>%s<i> %s.", You, moneyString(- delta), forDoingThis);
ep.msg("<h>%s<i> lost <h>%s<i> %s.", You, moneyString(-delta), forDoingThis);
}
return true;
} else {
// There was not enough money to pay
if (toDoThis != null && !toDoThis.isEmpty()) {
ep.msg("<h>%s<i> can't afford <h>%s<i> %s.", You, moneyString(- delta), toDoThis);
ep.msg("<h>%s<i> can't afford <h>%s<i> %s.", You, moneyString(-delta), toDoThis);
}
return false;
}
@ -410,7 +410,7 @@ public class Econ {
public static boolean modifyBalance(String account, double amount) {
if (amount < 0) {
return econ.withdrawPlayer(account, - amount).transactionSuccess();
return econ.withdrawPlayer(account, -amount).transactionSuccess();
} else {
return econ.depositPlayer(account, amount).transactionSuccess();
}

6
src/main/java/com/massivecraft/factions/integration/Essentials.java
View File

@ -3,11 +3,7 @@ package com.massivecraft.factions.integration;
import com.earth2me.essentials.Teleport;
import com.earth2me.essentials.Trade;
import com.massivecraft.factions.Conf;
import net.ess3.api.IEssentials;
import java.math.BigDecimal;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
@ -15,6 +11,8 @@ import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.plugin.Plugin;
import java.math.BigDecimal;
public class Essentials {
private static IEssentials essentials;

2
src/main/java/com/massivecraft/factions/integration/Worldguard.java
View File

@ -55,7 +55,7 @@ public class Worldguard {
// True: PVP is allowed
// False: PVP is disallowed
@SuppressWarnings("deprecation")
public static boolean isPVP(Player player) {
public static boolean isPVP(Player player) {
if (!enabled) {
// No WG hooks so we'll always bypass this check.
return true;

9
src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java
View File

@ -45,7 +45,8 @@ public class EngineDynmap {
public MarkerAPI markerApi;
public MarkerSet markerset;
private EngineDynmap() {}
private EngineDynmap() {
}
public static EngineDynmap getInstance() {
return i;
@ -63,7 +64,7 @@ public class EngineDynmap {
}
public static String getHtmlPlayerName(FPlayer fplayer) {
return fplayer != null ? escapeHtml(fplayer.getName()):"none";
return fplayer != null ? escapeHtml(fplayer.getName()) : "none";
}
public static String escapeHtml(String string) {
@ -72,8 +73,8 @@ public class EngineDynmap {
char c = string.charAt(i);
if (c > 127 || c == '"' || c == '<' || c == '>' || c == '&') {
out.append("&#")
.append((int) c)
.append(';');
.append((int) c)
.append(';');
} else {
out.append(c);
}

6
src/main/java/com/massivecraft/factions/integration/dynmap/TempAreaMarker.java
View File

@ -10,8 +10,8 @@ public class TempAreaMarker {
public String label;
public String world;
public double x[];
public double z[];
public double[] x;
public double[] z;
public String description;
public int lineColor;
@ -27,7 +27,7 @@ public class TempAreaMarker {
// CREATE
// -------------------------------------------- //
public static boolean equals(AreaMarker marker, double x[], double z[]) {
public static boolean equals(AreaMarker marker, double[] x, double[] z) {
int length = marker.getCornerCount();
if (x.length != length) {

48
src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
View File

@ -9,7 +9,6 @@ import com.massivecraft.factions.util.Particles.ParticleEffect;
import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@ -138,19 +137,19 @@ public class FactionsBlockListener implements Listener {
if (access != Access.ALLOW && me.getRole() != Role.LEADER) {
// TODO: Update this once new access values are added other than just allow / deny.
if (access == Access.DENY) {
if (!justCheck)
me.msg(TL.GENERIC_NOPERMISSION, action);
if (!justCheck)
me.msg(TL.GENERIC_NOPERMISSION, action);
return false;
} else if (myFaction.getOwnerListString(loc) != null && !myFaction.getOwnerListString(loc).isEmpty() && !myFaction.getOwnerListString(loc).contains(player.getName())) {
if (!justCheck)
me.msg("<b>You can't " + action + " in this territory, it is owned by: " + myFaction.getOwnerListString(loc));
if (!justCheck)
me.msg("<b>You can't " + action + " in this territory, it is owned by: " + myFaction.getOwnerListString(loc));
return false;
}
}
return true;
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockPlace(BlockPlaceEvent event) {
if (!event.canBuild()) {
return;
@ -166,7 +165,7 @@ public class FactionsBlockListener implements Listener {
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockFromTo(BlockFromToEvent event) {
if (!Conf.handleExploitLiquidFlow) {
return;
@ -190,14 +189,14 @@ public class FactionsBlockListener implements Listener {
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockDamage(BlockDamageEvent event) {
if (event.getInstaBreak() && !playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "destroy", false)) {
event.setCancelled(true);
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockPistonExtend(BlockPistonExtendEvent event) {
if (!Conf.pistonProtectionThroughDenyBuild) {
return;
@ -304,7 +303,7 @@ public class FactionsBlockListener implements Listener {
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockPistonRetract(BlockPistonRetractEvent event) {
// if not a sticky piston, retraction should be fine
if (!event.isSticky() || !Conf.pistonProtectionThroughDenyBuild) {
@ -439,7 +438,7 @@ public class FactionsBlockListener implements Listener {
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onFrostWalker(EntityBlockFormEvent event) {
if (event.getEntity() == null || event.getEntity().getType() != EntityType.PLAYER || event.getBlock() == null) {
return;
@ -485,7 +484,7 @@ public class FactionsBlockListener implements Listener {
return !rel.confDenyBuild(otherFaction.hasPlayersOnline());
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockBreak(BlockBreakEvent event) {
if (!playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "destroy", false)) {
event.setCancelled(true);
@ -507,20 +506,17 @@ public class FactionsBlockListener implements Listener {
}
@EventHandler
public void onFarmLandDamage(EntityChangeBlockEvent event)
{
if (event.getEntity() instanceof Player)
{
Player player = (Player) event.getEntity();
if (!playerCanBuildDestroyBlock(player, event.getBlock().getLocation(), PermissableAction.DESTROY.name(), true))
{
FPlayer me = FPlayers.getInstance().getById(player.getUniqueId().toString());
Faction otherFaction = Board.getInstance().getFactionAt(new FLocation(event.getBlock().getLocation()));
Faction myFaction = me.getFaction();
public void onFarmLandDamage(EntityChangeBlockEvent event) {
if (event.getEntity() instanceof Player) {
Player player = (Player) event.getEntity();
if (!playerCanBuildDestroyBlock(player, event.getBlock().getLocation(), PermissableAction.DESTROY.name(), true)) {
FPlayer me = FPlayers.getInstance().getById(player.getUniqueId().toString());
Faction otherFaction = Board.getInstance().getFactionAt(new FLocation(event.getBlock().getLocation()));
Faction myFaction = me.getFaction();
me.msg("<b>You can't jump on farmland in the territory of " + otherFaction.getTag(myFaction));
event.setCancelled(true);
}
}
me.msg("<b>You can't jump on farmland in the territory of " + otherFaction.getTag(myFaction));
event.setCancelled(true);
}
}
}
}

4
src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java
View File

@ -20,7 +20,7 @@ import java.util.logging.Level;
public class FactionsChatListener implements Listener {
// this is for handling slashless command usage and faction/alliance chat, set at lowest priority so Factions gets to them first
@EventHandler (priority = EventPriority.LOW, ignoreCancelled = true)
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerEarlyChat(AsyncPlayerChatEvent event) {
Player talkingPlayer = event.getPlayer();
String msg = event.getMessage();
@ -127,7 +127,7 @@ public class FactionsChatListener implements Listener {
// this is for handling insertion of the player's faction tag, set at highest priority to give other plugins a chance to modify chat first
@EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPlayerChat(AsyncPlayerChatEvent event) {
// Are we to insert the Faction tag into the format?
// If we are not to insert it - we are done.

30
src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@ -33,7 +33,7 @@ public class FactionsEntityListener implements Listener {
private static final Set<PotionEffectType> badPotionEffects = new LinkedHashSet<>(Arrays.asList(PotionEffectType.BLINDNESS, PotionEffectType.CONFUSION, PotionEffectType.HARM, PotionEffectType.HUNGER, PotionEffectType.POISON, PotionEffectType.SLOW, PotionEffectType.SLOW_DIGGING, PotionEffectType.WEAKNESS, PotionEffectType.WITHER));
@EventHandler (priority = EventPriority.NORMAL)
@EventHandler(priority = EventPriority.NORMAL)
public void onEntityDeath(EntityDeathEvent event) {
Entity entity = event.getEntity();
if (!(entity instanceof Player)) {
@ -86,7 +86,7 @@ public class FactionsEntityListener implements Listener {
* Who can I hurt? I can never hurt members or allies. I can always hurt enemies. I can hurt neutrals as long as
* they are outside their own territory.
*/
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onEntityDamage(EntityDamageEvent event) {
if (event instanceof EntityDamageByEntityEvent) {
EntityDamageByEntityEvent sub = (EntityDamageByEntityEvent) event;
@ -233,7 +233,7 @@ public class FactionsEntityListener implements Listener {
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onEntityExplode(EntityExplodeEvent event) {
Entity boomer = event.getEntity();
@ -270,11 +270,11 @@ public class FactionsEntityListener implements Listener {
// a single surrounding block in all 6 directions is broken if the material is weak enough
List<Block> targets = new ArrayList<>();
targets.add(center.getRelative(0, 0, 1));
targets.add(center.getRelative(0, 0, - 1));
targets.add(center.getRelative(0, 0, -1));
targets.add(center.getRelative(0, 1, 0));
targets.add(center.getRelative(0, - 1, 0));
targets.add(center.getRelative(0, -1, 0));
targets.add(center.getRelative(1, 0, 0));
targets.add(center.getRelative(- 1, 0, 0));
targets.add(center.getRelative(-1, 0, 0));
for (Block target : targets) {
@SuppressWarnings("deprecation")
@ -322,7 +322,7 @@ public class FactionsEntityListener implements Listener {
}
// mainly for flaming arrows; don't want allies or people in safe zones to be ignited even after damage event is cancelled
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
EntityDamageByEntityEvent sub = new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(), EntityDamageEvent.DamageCause.FIRE, 0d);
if (!this.canDamagerHurtDamagee(sub, false)) {
@ -330,7 +330,7 @@ public class FactionsEntityListener implements Listener {
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPotionSplashEvent(PotionSplashEvent event) {
// see if the potion has a harmful effect
boolean badjuju = false;
@ -544,7 +544,7 @@ public class FactionsEntityListener implements Listener {
return true;
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onCreatureSpawn(CreatureSpawnEvent event) {
if (event.getLocation() == null) {
return;
@ -555,7 +555,7 @@ public class FactionsEntityListener implements Listener {
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onEntityTarget(EntityTargetEvent event) {
// if there is a target
Entity target = event.getTarget();
@ -574,7 +574,7 @@ public class FactionsEntityListener implements Listener {
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPaintingBreak(HangingBreakEvent event) {
if (event.getCause() == RemoveCause.EXPLOSION) {
Location loc = event.getEntity().getLocation();
@ -610,7 +610,7 @@ public class FactionsEntityListener implements Listener {
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPaintingPlace(HangingPlaceEvent event) {
if (!FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "place paintings", false)) {
event.setCancelled(true);
@ -619,7 +619,7 @@ public class FactionsEntityListener implements Listener {
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onEntityChangeBlock(EntityChangeBlockEvent event) {
Entity entity = event.getEntity();
@ -715,7 +715,7 @@ public class FactionsEntityListener implements Listener {
}
// For disabling interactions with item frames in another faction's territory
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
// only need to check for item frames
if (event.getRightClicked().getType() != EntityType.ITEM_FRAME) {
@ -731,7 +731,7 @@ public class FactionsEntityListener implements Listener {
}
// For disabling interactions with armor stands in another faction's territory
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPlayerInteractAtEntity(PlayerInteractAtEntityEvent event) {
Entity entity = event.getRightClicked();

4
src/main/java/com/massivecraft/factions/listeners/FactionsExploitListener.java
View File

@ -19,7 +19,7 @@ public class FactionsExploitListener implements Listener {
}
@SuppressWarnings("deprecation")
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void obsidianGenerator(BlockFromToEvent event) {
if (!Conf.handleExploitObsidianGenerators) {
return;
@ -34,7 +34,7 @@ public class FactionsExploitListener implements Listener {
}
}
@EventHandler (priority = EventPriority.NORMAL, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void enderPearlTeleport(PlayerTeleportEvent event) {
if (!Conf.handleExploitEnderPearlClipping) {
return;

1768
src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

File diff suppressed because it is too large Load Diff

120
src/main/java/com/massivecraft/factions/skript/expressions/player/PlayerFactionExpression.java
View File

@ -18,80 +18,80 @@ import org.bukkit.event.Event;
public class PlayerFactionExpression extends SimpleExpression<String> {
static {
Skript.registerExpression(PlayerFactionExpression.class, String.class, ExpressionType.SIMPLE, "[the] faction of %player%", "[the] %player%['s] faction");
}
static {
Skript.registerExpression(PlayerFactionExpression.class, String.class, ExpressionType.SIMPLE, "[the] faction of %player%", "[the] %player%['s] faction");
}
Expression<Player> playerExpression;
Expression<Player> playerExpression;
@Override
public Class<? extends String> getReturnType() {
return String.class;
}
@Override
public Class<? extends String> getReturnType() {
return String.class;
}
@Override
public boolean isSingle() {
return true;
}
@Override
public boolean isSingle() {
return true;
}
@SuppressWarnings("unchecked")
@Override
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parser) {
playerExpression = (Expression<Player>) exprs[0];
return true;
}
@SuppressWarnings("unchecked")
@Override
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parser) {
playerExpression = (Expression<Player>) exprs[0];
return true;
}
@Override
public String toString(Event event, boolean debug) {
return "Player Faction Name Expression with expression player" + playerExpression.toString(event, debug);
}
@Override
public String toString(Event event, boolean debug) {
return "Player Faction Name Expression with expression player" + playerExpression.toString(event, debug);
}
@Override
protected String[] get(Event event) {
Player player = playerExpression.getSingle(event);
@Override
protected String[] get(Event event) {
Player player = playerExpression.getSingle(event);
if (player != null) {
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
return new String[]{fPlayer.getFaction().getTag()};
}
if (player != null) {
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
return new String[]{fPlayer.getFaction().getTag()};
}
return null;
return null;
}
}
@Override
public Class<?>[] acceptChange(final Changer.ChangeMode mode) {
if (mode == Changer.ChangeMode.DELETE || mode == Changer.ChangeMode.RESET || mode == Changer.ChangeMode.SET) {
return CollectionUtils.array(String.class);
}
return null;
}
@Override
public Class<?>[] acceptChange(final Changer.ChangeMode mode) {
if (mode == Changer.ChangeMode.DELETE || mode == Changer.ChangeMode.RESET || mode == Changer.ChangeMode.SET) {
return CollectionUtils.array(String.class);
}
return null;
}
@Override
public void change(Event event, Object[] delta, Changer.ChangeMode mode) {
Player player = playerExpression.getSingle(event);
if (player == null) {
return;
}
@Override
public void change(Event event, Object[] delta, Changer.ChangeMode mode) {
Player player = playerExpression.getSingle(event);
if (player == null) {
return;
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
switch (mode) {
case DELETE:
case RESET:
fPlayer.setFaction(Factions.getInstance().getWilderness());
break;
case SET:
Faction faction = Factions.getInstance().getByTag((String) delta[0]);
if (faction == null) {
faction = Factions.getInstance().getWilderness();
}
fPlayer.setFaction(faction);
break;
default:
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
switch (mode) {
case DELETE:
case RESET:
fPlayer.setFaction(Factions.getInstance().getWilderness());
break;
case SET:
Faction faction = Factions.getInstance().getByTag((String) delta[0]);
if (faction == null) {
faction = Factions.getInstance().getWilderness();
}
fPlayer.setFaction(faction);
break;
default:
}
}
}
}

116
src/main/java/com/massivecraft/factions/skript/expressions/player/PlayerPowerExpression.java
View File

@ -16,80 +16,80 @@ import org.bukkit.event.Event;
public class PlayerPowerExpression extends SimpleExpression<Number> {
static {
Skript.registerExpression(PlayerPowerExpression.class, Number.class, ExpressionType.SIMPLE, "[the] power of %player%", "[the] %player%['s] power");
}
static {
Skript.registerExpression(PlayerPowerExpression.class, Number.class, ExpressionType.SIMPLE, "[the] power of %player%", "[the] %player%['s] power");
}
Expression<Player> playerExpression;
Expression<Player> playerExpression;
@Override
public Class<? extends Number> getReturnType() {
return Double.class;
}
@Override
public Class<? extends Number> getReturnType() {
return Double.class;
}
@Override
public boolean isSingle() {
return true;
}
@Override
public boolean isSingle() {
return true;
}
@SuppressWarnings("unchecked")
@Override
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parser) {
playerExpression = (Expression<Player>) exprs[0];
return true;
}
@SuppressWarnings("unchecked")
@Override
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parser) {
playerExpression = (Expression<Player>) exprs[0];
return true;
}
@Override
public String toString(Event event, boolean debug) {
return "Player Power with expression player" + playerExpression.toString(event, debug);
}
@Override
public String toString(Event event, boolean debug) {
return "Player Power with expression player" + playerExpression.toString(event, debug);
}
@Override
protected Double[] get(Event event) {
Player player = playerExpression.getSingle(event);
@Override
protected Double[] get(Event event) {
Player player = playerExpression.getSingle(event);
if (player != null) {
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
return new Double[]{fPlayer.getFaction().getPower()};
}
if (player != null) {
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
return new Double[]{fPlayer.getFaction().getPower()};
}
return null;
return null;
}
}
@Override
public Class<?>[] acceptChange(final Changer.ChangeMode mode) {
if (mode == Changer.ChangeMode.RESET || mode == Changer.ChangeMode.ADD || mode == Changer.ChangeMode.REMOVE) {
return CollectionUtils.array(Number.class);
}
return null;
}
@Override
public Class<?>[] acceptChange(final Changer.ChangeMode mode) {
if (mode == Changer.ChangeMode.RESET || mode == Changer.ChangeMode.ADD || mode == Changer.ChangeMode.REMOVE) {
return CollectionUtils.array(Number.class);
}
return null;
}
@Override
public void change(Event event, Object[] delta, Changer.ChangeMode mode) {
Player player = playerExpression.getSingle(event);
if (player == null) {
return;
}
@Override
public void change(Event event, Object[] delta, Changer.ChangeMode mode) {
Player player = playerExpression.getSingle(event);
if (player == null) {
return;
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
switch (mode) {
case ADD:
fPlayer.alterPower(Double.valueOf((Long) delta[0]));
break;
case REMOVE:
fPlayer.alterPower(Double.valueOf((Long) delta[0]) * -1);
break;
case RESET:
fPlayer.alterPower(fPlayer.getPowerMax() * -1);
break;
default:
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
switch (mode) {
case ADD:
fPlayer.alterPower(Double.valueOf((Long) delta[0]));
break;
case REMOVE:
fPlayer.alterPower(Double.valueOf((Long) delta[0]) * -1);
break;
case RESET:
fPlayer.alterPower(fPlayer.getPowerMax() * -1);
break;
default:
}
}
}
}

112
src/main/java/com/massivecraft/factions/skript/expressions/player/PlayerRoleExpression.java
View File

@ -16,77 +16,77 @@ import org.bukkit.event.Event;
public class PlayerRoleExpression extends SimpleExpression<String> {
static {
Skript.registerExpression(PlayerRoleExpression.class, String.class, ExpressionType.SIMPLE, "[the] role of %player%", "[the] %player%['s] role");
}
static {
Skript.registerExpression(PlayerRoleExpression.class, String.class, ExpressionType.SIMPLE, "[the] role of %player%", "[the] %player%['s] role");
}
Expression<Player> playerExpression;
Expression<Player> playerExpression;
@Override
public Class<? extends String> getReturnType() {
return String.class;
}
@Override
public Class<? extends String> getReturnType() {
return String.class;
}
@Override
public boolean isSingle() {
return true;
}
@Override
public boolean isSingle() {
return true;
}
@SuppressWarnings("unchecked")
@Override
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parser) {
playerExpression = (Expression<Player>) exprs[0];
return true;
}
@SuppressWarnings("unchecked")
@Override
public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parser) {
playerExpression = (Expression<Player>) exprs[0];
return true;
}
@Override
public String toString(Event event, boolean debug) {
return "Player Faction Name Expression with expression player" + playerExpression.toString(event, debug);
}
@Override
public String toString(Event event, boolean debug) {
return "Player Faction Name Expression with expression player" + playerExpression.toString(event, debug);
}
@Override
protected String[] get(Event event) {
Player player = playerExpression.getSingle(event);
@Override
protected String[] get(Event event) {
Player player = playerExpression.getSingle(event);
if (player != null) {
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
return new String[]{fPlayer.getRole().toString()};
}
if (player != null) {
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
return new String[]{fPlayer.getRole().toString()};
}
return null;
return null;
}
}
@Override
public Class<?>[] acceptChange(final Changer.ChangeMode mode) {
if (mode == Changer.ChangeMode.DELETE || mode == Changer.ChangeMode.RESET || mode == Changer.ChangeMode.SET) {
return CollectionUtils.array(String.class);
}
return null;
}
@Override
public Class<?>[] acceptChange(final Changer.ChangeMode mode) {
if (mode == Changer.ChangeMode.DELETE || mode == Changer.ChangeMode.RESET || mode == Changer.ChangeMode.SET) {
return CollectionUtils.array(String.class);
}
return null;
}
@Override
public void change(Event event, Object[] delta, Changer.ChangeMode mode) {
Player player = playerExpression.getSingle(event);
if (player == null) {
return;
}
@Override
public void change(Event event, Object[] delta, Changer.ChangeMode mode) {
Player player = playerExpression.getSingle(event);
if (player == null) {
return;
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
switch (mode) {
case DELETE:
case RESET:
fPlayer.setRole(Role.RECRUIT);
break;
case SET:
fPlayer.setRole(Role.fromString(((String) delta[0]).toLowerCase()));
break;
default:
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
switch (mode) {
case DELETE:
case RESET:
fPlayer.setRole(Role.RECRUIT);
break;
case SET:
fPlayer.setRole(Role.fromString(((String) delta[0]).toLowerCase()));
break;
default:
}
}
}
}

20
src/main/java/com/massivecraft/factions/struct/Relation.java
View File

@ -96,14 +96,18 @@ public enum Relation implements Permissable {
public ChatColor getColor() {
switch (this)
{
case MEMBER: return Conf.colorMember;
case ALLY: return Conf.colorAlly;
case NEUTRAL: return Conf.colorNeutral;
case TRUCE: return Conf.colorTruce;
default: return Conf.colorEnemy;
}
switch (this) {
case MEMBER:
return Conf.colorMember;
case ALLY:
return Conf.colorAlly;
case NEUTRAL:
return Conf.colorNeutral;
case TRUCE:
return Conf.colorTruce;
default:
return Conf.colorEnemy;
}
}
// return appropriate Conf setting for DenyBuild based on this relation and their online status

20
src/main/java/com/massivecraft/factions/struct/Role.java
View File

@ -93,14 +93,18 @@ public enum Role implements Permissable {
public String getPrefix() {
switch (this)
{
case LEADER: return Conf.prefixLeader;
case COLEADER: return Conf.prefixCoLeader;
case MODERATOR: return Conf.prefixMod;
case NORMAL: return Conf.prefixNormal;
case RECRUIT: return Conf.prefixRecruit;
}
switch (this) {
case LEADER:
return Conf.prefixLeader;
case COLEADER:
return Conf.prefixCoLeader;
case MODERATOR:
return Conf.prefixMod;
case NORMAL:
return Conf.prefixNormal;
case RECRUIT:
return Conf.prefixRecruit;
}
return "";
}

6
src/main/java/com/massivecraft/factions/util/ClipPlaceholderAPIManager.java
View File

@ -107,7 +107,7 @@ public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements R
case "faction_claims":
return String.valueOf(faction.getAllClaims().size());
case "faction_founded":
return String.valueOf(TL.sdf.format(faction.getFoundedDate()));
return TL.sdf.format(faction.getFoundedDate());
case "faction_joining":
return (faction.getOpen() ? TL.COMMAND_SHOW_UNINVITED.toString() : TL.COMMAND_SHOW_INVITATION.toString());
case "faction_peaceful":
@ -156,8 +156,8 @@ public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements R
case "faction_maxvaults":
return String.valueOf(faction.getMaxVaults());
case "faction_name_at_location":
Faction factionAtLocation = Board.getInstance().getFactionAt(new FLocation(player.getLocation()));
return factionAtLocation != null ? factionAtLocation.getTag():Factions.getInstance().getWilderness().getTag();
Faction factionAtLocation = Board.getInstance().getFactionAt(new FLocation(player.getLocation()));
return factionAtLocation != null ? factionAtLocation.getTag() : Factions.getInstance().getWilderness().getTag();
}
return null;

2
src/main/java/com/massivecraft/factions/util/EnumTypeAdapter.java
View File

@ -37,7 +37,7 @@ public final class EnumTypeAdapter<T extends Enum<T>> extends TypeAdapter<T> {
public static <TT> TypeAdapterFactory newEnumTypeHierarchyFactory() {
return new TypeAdapterFactory() {
@SuppressWarnings ({"rawtypes", "unchecked"})
@SuppressWarnings({"rawtypes", "unchecked"})
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
Class<? super T> rawType = typeToken.getRawType();
if (!Enum.class.isAssignableFrom(rawType) || rawType == Enum.class) {

4
src/main/java/com/massivecraft/factions/util/FactionGUI.java
View File

@ -4,8 +4,8 @@ import org.bukkit.event.inventory.ClickType;
public interface FactionGUI {
public void onClick(int slot, ClickType action);
void onClick(int slot, ClickType action);
public void build();
void build();
}

2
src/main/java/com/massivecraft/factions/util/LazyLocation.java
View File

@ -12,7 +12,7 @@ import java.io.Serializable;
*/
public class LazyLocation implements Serializable {
private static final long serialVersionUID = - 6049901271320963314L;
private static final long serialVersionUID = -6049901271320963314L;
private transient Location location = null;
private String worldName;
private double x;

20
src/main/java/com/massivecraft/factions/util/MiscUtil.java
View File

@ -100,11 +100,21 @@ public class MiscUtil {
}
switch (player.getRole()) {
case LEADER: admins.add(player); break;
case COLEADER: admins.add(player); break;
case MODERATOR: moderators.add(player); break;
case NORMAL: normal.add(player); break;
case RECRUIT: recruit.add(player); break;
case LEADER:
admins.add(player);
break;
case COLEADER:
admins.add(player);
break;
case MODERATOR:
moderators.add(player);
break;
case NORMAL:
normal.add(player);
break;
case RECRUIT:
recruit.add(player);
break;
}
}

8
src/main/java/com/massivecraft/factions/util/MultiversionMaterials.java
View File

@ -859,7 +859,7 @@ public enum MultiversionMaterials {
ZOMBIE_WALL_HEAD("SKULL", 0),
;
static int newV = - 1;
static int newV = -1;
private static HashMap<String, MultiversionMaterials> cachedSearch = new HashMap<>();
String m;
int data;
@ -898,11 +898,11 @@ public enum MultiversionMaterials {
public static MultiversionMaterials fromString(String key) {
try {
return MultiversionMaterials.valueOf(key);
return MultiversionMaterials.valueOf(key);
} catch (IllegalArgumentException e) {
String[] split = key.split(":");
return split.length == 1 ? requestXMaterial(key, (byte) 0):requestXMaterial(split[0], (byte) Integer.parseInt(split[1]));
return split.length == 1 ? requestXMaterial(key, (byte) 0) : requestXMaterial(split[0], (byte) Integer.parseInt(split[1]));
}
}
@ -968,7 +968,7 @@ public enum MultiversionMaterials {
public Material parseMaterial() {
Material mat = Material.matchMaterial(this.toString());
return mat != null ? mat:Material.matchMaterial(m);
return mat != null ? mat : Material.matchMaterial(m);
}
}

95
src/main/java/com/massivecraft/factions/util/Particles/ParticleEffect.java
View File

@ -20,7 +20,7 @@ import java.util.Map.Entry;
/**
* <b>ParticleEffect Library</b>
* This library was created by @DarkBlade12 and allows you to display all Minecraft particle effects on a Bukkit server
*
* <p>
* You are welcome to use it, modify it and redistribute it under the following conditions:
* <ul>
* <li>Don't claim this class as your own
@ -47,7 +47,7 @@ public enum ParticleEffect {
* <li>The speed value influences the velocity at which the particle flies off
* </ul>
*/
EXPLOSION_NORMAL("explode", 0, - 1, ParticleProperty.DIRECTIONAL),
EXPLOSION_NORMAL("explode", 0, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by exploding ghast fireballs and wither skulls:
* <ul>
@ -55,7 +55,7 @@ public enum ParticleEffect {
* <li>The speed value slightly influences the size of this particle effect
* </ul>
*/
EXPLOSION_LARGE("largeexplode", 1, - 1),
EXPLOSION_LARGE("largeexplode", 1, -1),
/**
* A particle effect which is displayed by exploding tnt and creepers:
* <ul>
@ -63,7 +63,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
EXPLOSION_HUGE("hugeexplosion", 2, - 1),
EXPLOSION_HUGE("hugeexplosion", 2, -1),
/**
* A particle effect which is displayed by launching fireworks:
* <ul>
@ -71,7 +71,7 @@ public enum ParticleEffect {
* <li>The speed value influences the velocity at which the particle flies off
* </ul>
*/
FIREWORKS_SPARK("fireworksSpark", 3, - 1, ParticleProperty.DIRECTIONAL),
FIREWORKS_SPARK("fireworksSpark", 3, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by swimming entities and arrows in water:
* <ul>
@ -79,7 +79,7 @@ public enum ParticleEffect {
* <li>The speed value influences the velocity at which the particle flies off
* </ul>
*/
WATER_BUBBLE("bubble", 4, - 1, ParticleProperty.DIRECTIONAL, ParticleProperty.REQUIRES_WATER),
WATER_BUBBLE("bubble", 4, -1, ParticleProperty.DIRECTIONAL, ParticleProperty.REQUIRES_WATER),
/**
* A particle effect which is displayed by swimming entities and shaking wolves:
* <ul>
@ -87,7 +87,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
WATER_SPLASH("splash", 5, - 1, ParticleProperty.DIRECTIONAL),
WATER_SPLASH("splash", 5, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed on water when fishing:
* <ul>
@ -103,7 +103,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
SUSPENDED("suspended", 7, - 1, ParticleProperty.REQUIRES_WATER),
SUSPENDED("suspended", 7, -1, ParticleProperty.REQUIRES_WATER),
/**
* A particle effect which is displayed by air when close to bedrock and the in the void:
* <ul>
@ -111,7 +111,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
SUSPENDED_DEPTH("depthSuspend", 8, - 1, ParticleProperty.DIRECTIONAL),
SUSPENDED_DEPTH("depthSuspend", 8, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed when landing a critical hit and by arrows:
* <ul>
@ -119,7 +119,7 @@ public enum ParticleEffect {
* <li>The speed value influences the velocity at which the particle flies off
* </ul>
*/
CRIT("crit", 9, - 1, ParticleProperty.DIRECTIONAL),
CRIT("crit", 9, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed when landing a hit with an enchanted weapon:
* <ul>
@ -127,7 +127,7 @@ public enum ParticleEffect {
* <li>The speed value influences the velocity at which the particle flies off
* </ul>
*/
CRIT_MAGIC("magicCrit", 10, - 1, ParticleProperty.DIRECTIONAL),
CRIT_MAGIC("magicCrit", 10, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by primed tnt, torches, droppers, dispensers, end portals, brewing stands and monster spawners:
* <ul>
@ -135,7 +135,7 @@ public enum ParticleEffect {
* <li>The speed value influences the velocity at which the particle flies off
* </ul>
*/
SMOKE_NORMAL("smoke", 11, - 1, ParticleProperty.DIRECTIONAL),
SMOKE_NORMAL("smoke", 11, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by fire, minecarts with furnace and blazes:
* <ul>
@ -143,7 +143,7 @@ public enum ParticleEffect {
* <li>The speed value influences the velocity at which the particle flies off
* </ul>
*/
SMOKE_LARGE("largesmoke", 12, - 1, ParticleProperty.DIRECTIONAL),
SMOKE_LARGE("largesmoke", 12, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed when splash potions or bottles o' enchanting hit something:
* <ul>
@ -152,7 +152,7 @@ public enum ParticleEffect {
* <li>Only the motion on the y-axis can be controlled, the motion on the x- and z-axis are multiplied by 0.1 when setting the values to 0
* </ul>
*/
SPELL("spell", 13, - 1),
SPELL("spell", 13, -1),
/**
* A particle effect which is displayed when instant splash potions hit something:
* <ul>
@ -161,7 +161,7 @@ public enum ParticleEffect {
* <li>Only the motion on the y-axis can be controlled, the motion on the x- and z-axis are multiplied by 0.1 when setting the values to 0
* </ul>
*/
SPELL_INSTANT("instantSpell", 14, - 1),
SPELL_INSTANT("instantSpell", 14, -1),
/**
* A particle effect which is displayed by entities with active potion effects:
* <ul>
@ -170,7 +170,7 @@ public enum ParticleEffect {
* <li>The particle color gets lighter when increasing the speed and darker when decreasing the speed
* </ul>
*/
SPELL_MOB("mobSpell", 15, - 1, ParticleProperty.COLORABLE),
SPELL_MOB("mobSpell", 15, -1, ParticleProperty.COLORABLE),
/**
* A particle effect which is displayed by entities with active potion effects applied through a beacon:
* <ul>
@ -179,7 +179,7 @@ public enum ParticleEffect {
* <li>The particle color gets lighter when increasing the speed and darker when decreasing the speed
* </ul>
*/
SPELL_MOB_AMBIENT("mobSpellAmbient", 16, - 1, ParticleProperty.COLORABLE),
SPELL_MOB_AMBIENT("mobSpellAmbient", 16, -1, ParticleProperty.COLORABLE),
/**
* A particle effect which is displayed by witches:
* <ul>
@ -188,7 +188,7 @@ public enum ParticleEffect {
* <li>Only the motion on the y-axis can be controlled, the motion on the x- and z-axis are multiplied by 0.1 when setting the values to 0
* </ul>
*/
SPELL_WITCH("witchMagic", 17, - 1),
SPELL_WITCH("witchMagic", 17, -1),
/**
* A particle effect which is displayed by blocks beneath a water source:
* <ul>
@ -196,7 +196,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
DRIP_WATER("dripWater", 18, - 1),
DRIP_WATER("dripWater", 18, -1),
/**
* A particle effect which is displayed by blocks beneath a lava source:
* <ul>
@ -204,7 +204,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
DRIP_LAVA("dripLava", 19, - 1),
DRIP_LAVA("dripLava", 19, -1),
/**
* A particle effect which is displayed when attacking a villager in a village:
* <ul>
@ -212,7 +212,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
VILLAGER_ANGRY("angryVillager", 20, - 1),
VILLAGER_ANGRY("angryVillager", 20, -1),
/**
* A particle effect which is displayed when using bone meal and trading with a villager in a village:
* <ul>
@ -220,7 +220,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
VILLAGER_HAPPY("happyVillager", 21, - 1, ParticleProperty.DIRECTIONAL),
VILLAGER_HAPPY("happyVillager", 21, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by mycelium:
* <ul>
@ -228,7 +228,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
TOWN_AURA("townaura", 22, - 1, ParticleProperty.DIRECTIONAL),
TOWN_AURA("townaura", 22, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by note blocks:
* <ul>
@ -236,7 +236,7 @@ public enum ParticleEffect {
* <li>The speed value causes the particle to be colored green when set to 0
* </ul>
*/
NOTE("note", 23, - 1, ParticleProperty.COLORABLE),
NOTE("note", 23, -1, ParticleProperty.COLORABLE),
/**
* A particle effect which is displayed by nether portals, endermen, ender pearls, eyes of ender, ender chests and dragon eggs:
* <ul>
@ -244,7 +244,7 @@ public enum ParticleEffect {
* <li>The speed value influences the spread of this particle effect
* </ul>
*/
PORTAL("portal", 24, - 1, ParticleProperty.DIRECTIONAL),
PORTAL("portal", 24, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by enchantment tables which are nearby bookshelves:
* <ul>
@ -252,7 +252,7 @@ public enum ParticleEffect {
* <li>The speed value influences the spread of this particle effect
* </ul>
*/
ENCHANTMENT_TABLE("enchantmenttable", 25, - 1, ParticleProperty.DIRECTIONAL),
ENCHANTMENT_TABLE("enchantmenttable", 25, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by torches, active furnaces, magma cubes and monster spawners:
* <ul>
@ -260,7 +260,7 @@ public enum ParticleEffect {
* <li>The speed value influences the velocity at which the particle flies off
* </ul>
*/
FLAME("flame", 26, - 1, ParticleProperty.DIRECTIONAL),
FLAME("flame", 26, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by lava:
* <ul>
@ -268,7 +268,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
LAVA("lava", 27, - 1),
LAVA("lava", 27, -1),
/**
* A particle effect which is currently unused:
* <ul>
@ -276,7 +276,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
FOOTSTEP("footstep", 28, - 1),
FOOTSTEP("footstep", 28, -1),
/**
* A particle effect which is displayed when a mob dies:
* <ul>
@ -284,7 +284,7 @@ public enum ParticleEffect {
* <li>The speed value influences the velocity at which the particle flies off
* </ul>
*/
CLOUD("cloud", 29, - 1, ParticleProperty.DIRECTIONAL),
CLOUD("cloud", 29, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by redstone ore, powered redstone, redstone torches and redstone repeaters:
* <ul>
@ -292,7 +292,7 @@ public enum ParticleEffect {
* <li>The speed value causes the particle to be colored red when set to 0
* </ul>
*/
REDSTONE("reddust", 30, - 1, ParticleProperty.COLORABLE),
REDSTONE("reddust", 30, -1, ParticleProperty.COLORABLE),
/**
* A particle effect which is displayed when snowballs hit a block:
* <ul>
@ -300,7 +300,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
SNOWBALL("snowballpoof", 31, - 1),
SNOWBALL("snowballpoof", 31, -1),
/**
* A particle effect which is currently unused:
* <ul>
@ -308,7 +308,7 @@ public enum ParticleEffect {
* <li>The speed value influences the velocity at which the particle flies off
* </ul>
*/
SNOW_SHOVEL("snowshovel", 32, - 1, ParticleProperty.DIRECTIONAL),
SNOW_SHOVEL("snowshovel", 32, -1, ParticleProperty.DIRECTIONAL),
/**
* A particle effect which is displayed by slimes:
* <ul>
@ -316,7 +316,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
SLIME("slime", 33, - 1),
SLIME("slime", 33, -1),
/**
* A particle effect which is displayed when breeding and taming animals:
* <ul>
@ -324,7 +324,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
HEART("heart", 34, - 1),
HEART("heart", 34, -1),
/**
* A particle effect which is displayed by barriers:
* <ul>
@ -339,7 +339,7 @@ public enum ParticleEffect {
* <li>It looks like a little piece with an item texture
* </ul>
*/
ITEM_CRACK("iconcrack", 36, - 1, ParticleProperty.DIRECTIONAL, ParticleProperty.REQUIRES_DATA),
ITEM_CRACK("iconcrack", 36, -1, ParticleProperty.DIRECTIONAL, ParticleProperty.REQUIRES_DATA),
/**
* A particle effect which is displayed when breaking blocks or sprinting:
* <ul>
@ -347,7 +347,7 @@ public enum ParticleEffect {
* <li>The speed value has no influence on this particle effect
* </ul>
*/
BLOCK_CRACK("blockcrack", 37, - 1, ParticleProperty.REQUIRES_DATA),
BLOCK_CRACK("blockcrack", 37, -1, ParticleProperty.REQUIRES_DATA),
/**
* A particle effect which is displayed when falling:
* <ul>
@ -524,7 +524,6 @@ public enum ParticleEffect {
/**
* Determine if this particle effect has a specific property
*
*
* @param property - property to check.
* @return Whether it has the property or not
*/
@ -538,7 +537,7 @@ public enum ParticleEffect {
* @return Whether the particle effect is supported or not
*/
public boolean isSupported() {
if (requiredVersion == - 1) {
if (requiredVersion == -1) {
return true;
}
return ParticlePacket.getVersion() >= requiredVersion;
@ -946,7 +945,7 @@ public enum ParticleEffect {
* @param material Material of the item/block
* @param data Data value of the item/block
*/
@SuppressWarnings ("deprecation")
@SuppressWarnings("deprecation")
public ParticleData(Material material, byte data) {
this.material = material;
this.data = data;
@ -1177,7 +1176,7 @@ public enum ParticleEffect {
/**
* Represents the color for the {@link ParticleEffect#NOTE} effect
*
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
* @author DarkBlade12
@ -1236,7 +1235,7 @@ public enum ParticleEffect {
/**
* Represents a runtime exception that is thrown either if the displayed particle effect requires data and has none or vice-versa or if the data type is incorrect
*
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
* @author DarkBlade12
@ -1257,7 +1256,7 @@ public enum ParticleEffect {
/**
* Represents a runtime exception that is thrown either if the displayed particle effect is not colorable or if the particle color type is incorrect
*
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
* @author DarkBlade12
@ -1278,7 +1277,7 @@ public enum ParticleEffect {
/**
* Represents a runtime exception that is thrown if the displayed particle effect requires a newer version
*
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
* @author DarkBlade12
@ -1299,7 +1298,7 @@ public enum ParticleEffect {
/**
* Represents a particle effect packet with all attributes which is used for sending packets to the players
*
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
* @author DarkBlade12
@ -1532,7 +1531,7 @@ public enum ParticleEffect {
/**
* Represents a runtime exception that is thrown if a bukkit version is not compatible with this library
*
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
* @author DarkBlade12
@ -1554,7 +1553,7 @@ public enum ParticleEffect {
/**
* Represents a runtime exception that is thrown if packet instantiation fails
*
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
* @author DarkBlade12
@ -1576,7 +1575,7 @@ public enum ParticleEffect {
/**
* Represents a runtime exception that is thrown if packet sending fails
*
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
* @author DarkBlade12

8
src/main/java/com/massivecraft/factions/util/Particles/ReflectionUtils.java
View File

@ -11,9 +11,9 @@ import java.util.Map;
/**
* <b>ReflectionUtils</b>
*
* <p>
* This class provides useful methods which makes dealing with reflection much easier, especially when working with Bukkit
*
* <p>
* You are welcome to use it, modify it and redistribute it under the following conditions:
* <ul>
* <li>Don't claim this class as your own
@ -346,7 +346,7 @@ public final class ReflectionUtils {
/**
* Represents an enumeration of dynamic packages of NMS and CraftBukkit
*
* <p>
* This class is part of the <b>ReflectionUtils</b> and follows the same usage conditions
*
* @author DarkBlade12
@ -433,7 +433,7 @@ public final class ReflectionUtils {
/**
* Represents an enumeration of Java data types with corresponding classes
*
* <p>
* This class is part of the <b>ReflectionUtils</b> and follows the same usage conditions
*
* @author DarkBlade12

16
src/main/java/com/massivecraft/factions/util/SpiralTask.java
View File

@ -27,7 +27,7 @@ public abstract class SpiralTask implements Runnable {
// general task-related reference data
private transient World world = null;
private transient boolean readyToGo = false;
private transient int taskID = - 1;
private transient int taskID = -1;
private transient int limit = 0;
// values for the spiral pattern routine
@ -35,10 +35,10 @@ public abstract class SpiralTask implements Runnable {
private transient int z = 0;
private transient boolean isZLeg = false;
private transient boolean isNeg = false;
private transient int length = - 1;
private transient int length = -1;
private transient int current = 0;
@SuppressWarnings ("LeakingThisInConstructor")
@SuppressWarnings("LeakingThisInConstructor")
public SpiralTask(FLocation fLocation, int radius) {
// limit is determined based on spiral leg length for given radius; see insideRadius()
this.limit = (radius - 1) * 2;
@ -103,7 +103,7 @@ public abstract class SpiralTask implements Runnable {
}
public final void setTaskID(int ID) {
if (ID == - 1) {
if (ID == -1) {
this.stop();
}
taskID = ID;
@ -169,9 +169,9 @@ public abstract class SpiralTask implements Runnable {
// move one chunk further in the appropriate direction
if (isZLeg) {
z += (isNeg) ? - 1 : 1;
z += (isNeg) ? -1 : 1;
} else {
x += (isNeg) ? - 1 : 1;
x += (isNeg) ? -1 : 1;
}
return true;
@ -199,11 +199,11 @@ public abstract class SpiralTask implements Runnable {
readyToGo = false;
Bukkit.getServer().getScheduler().cancelTask(taskID);
taskID = - 1;
taskID = -1;
}
// is this task still valid/workable?
public final boolean valid() {
return taskID != - 1;
return taskID != -1;
}
}

114
src/main/java/com/massivecraft/factions/util/UtilFly.java Normal file
View File

@ -0,0 +1,114 @@
package com.massivecraft.factions.util;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import java.util.ArrayList;
import java.util.Iterator;
public class UtilFly {
public static ArrayList<FPlayer> playersFlying;
static {
playersFlying = SavageFactions.playersFlying;
}
public UtilFly() {
}
public static void run() {
if (SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight")) {
playersFlying.clear();
Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, new Runnable() {
public void run() {
Iterator var2 = UtilFly.playersFlying.iterator();
while (var2.hasNext()) {
FPlayer fp = (FPlayer) var2.next();
if (fp != null) {
fp.checkIfNearbyEnemies();
}
}
}
}, 0L, (long) SavageFactions.plugin.getConfig().getInt("fly-task-interval", 10));
}
}
public static void setFly(FPlayer fp, boolean fly, boolean silent, boolean damage) {
if (SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight")) {
fp.getPlayer().setAllowFlight(fly);
fp.getPlayer().setFlying(fly);
fp.setFlying(fly);
if (fly) {
playersFlying.add(fp);
} else {
playersFlying.remove(fp);
}
if (!silent) {
if (!damage) {
fp.msg(TL.COMMAND_FLY_CHANGE, fly ? "enabled" : "disabled");
} else {
fp.msg(TL.COMMAND_FLY_DAMAGE);
}
}
setFallDamage(fp, fly, damage);
}
}
public static void checkFly(FPlayer me, Faction factionTo) {
if (SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight")) {
if (!me.isAdminBypassing() || !me.isFlying()) {
Relation relationTo;
if (!me.isFlying()) {
if (me.isAdminBypassing()) {
setFly(me, true, false, false);
return;
}
if (factionTo == me.getFaction() && me.getPlayer().hasPermission("factions.fly")) {
setFly(me, true, false, false);
} else {
relationTo = factionTo.getRelationTo(me);
if (factionTo.isWilderness() && me.canflyinWilderness() || factionTo.isWarZone() && me.canflyinWarzone() || factionTo.isSafeZone() && me.canflyinSafezone() || relationTo == Relation.ENEMY && me.canflyinEnemy() || relationTo == Relation.ALLY && me.canflyinAlly() || relationTo == Relation.TRUCE && me.canflyinTruce() || relationTo == Relation.NEUTRAL && me.canflyinNeutral()) {
setFly(me, true, false, false);
}
}
} else {
relationTo = factionTo.getRelationTo(me);
if (factionTo.equals(me.getFaction()) && !me.getPlayer().hasPermission("factions.fly") || factionTo.isWilderness() && !me.canflyinWilderness() || factionTo.isWarZone() && !me.canflyinWarzone() || factionTo.isSafeZone() && !me.canflyinSafezone() || relationTo == Relation.ENEMY && !me.canflyinEnemy() || relationTo == Relation.ALLY && !me.canflyinAlly() || relationTo == Relation.TRUCE && !me.canflyinTruce() || relationTo == Relation.NEUTRAL && !me.canflyinNeutral()) {
setFly(me, false, false, false);
}
}
}
}
}
public static void setFallDamage(final FPlayer fp, boolean fly, boolean damage) {
if (!fly) {
if (!damage) {
fp.sendMessage(TL.COMMAND_FLY_COOLDOWN.toString().replace("{amount}", String.valueOf(SavageFactions.plugin.getConfig().getInt("fly-falldamage-cooldown", 3))));
}
int cooldown = SavageFactions.plugin.getConfig().getInt("fly-falldamage-cooldown", 3);
if (cooldown > 0) {
fp.setTakeFallDamage(false);
Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, new Runnable() {
public void run() {
fp.setTakeFallDamage(true);
}
}, 20L * (long) cooldown);
}
}
}
}

10
src/main/java/com/massivecraft/factions/util/VisualizeUtil.java
View File

@ -24,20 +24,20 @@ public class VisualizeUtil {
return ret;
}
@SuppressWarnings ("deprecation")
@SuppressWarnings("deprecation")
public static void addLocation(Player player, Location location, Material type, byte data) {
getPlayerLocations(player).add(location);
player.sendBlockChange(location, type, data);
}
@SuppressWarnings ("deprecation")
@SuppressWarnings("deprecation")
public static void addLocation(Player player, Location location, Material material) {
getPlayerLocations(player).add(location);
player.sendBlockChange(location, material, (byte) 0);
}
@SuppressWarnings ("deprecation")
@SuppressWarnings("deprecation")
public static void addLocations(Player player, Collection<Location> locations, Material material) {
Set<Location> ploc = getPlayerLocations(player);
for (Location location : locations) {
@ -46,7 +46,7 @@ public class VisualizeUtil {
}
}
@SuppressWarnings ("deprecation")
@SuppressWarnings("deprecation")
public static void addBlocks(Player player, Collection<Block> blocks, Material material) {
Set<Location> ploc = getPlayerLocations(player);
for (Block block : blocks) {
@ -56,7 +56,7 @@ public class VisualizeUtil {
}
}
@SuppressWarnings ("deprecation")
@SuppressWarnings("deprecation")
public static void clear(Player player) {
Set<Location> locations = getPlayerLocations(player);
if (locations == null) {

2
src/main/java/com/massivecraft/factions/util/WarmUpUtil.java
View File

@ -12,7 +12,7 @@ public class WarmUpUtil {
* @param action The action, inserted into the notification message.
* @param runnable The task to run after the delay. If the delay is 0, the task is instantly ran.
* @param delay The time used, in seconds, for the delay.
*
* <p>
* note: for translations: %s = action, %d = delay
*/
public static void process(final FPlayer player, Warmup warmup, TL translationKey, String action, final Runnable runnable, long delay) {

4
src/main/java/com/massivecraft/factions/util/WarpGUI.java
View File

@ -140,9 +140,9 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
}
if (Conf.bankEnabled && Conf.bankFactionPaysCosts && fme.hasFaction()) {
return Econ.modifyMoney(fme.getFaction(), - cost, TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString());
return Econ.modifyMoney(fme.getFaction(), -cost, TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString());
} else {
return Econ.modifyMoney(fme, - cost, TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString());
return Econ.modifyMoney(fme, -cost, TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString());
}
}

7
src/main/java/com/massivecraft/factions/zcore/MCommand.java
View File

@ -76,7 +76,7 @@ public abstract class MCommand<T extends MPlugin> {
}
public String getHelpShort() {
return this.helpShort != null ? this.helpShort:getUsageTranslation().toString();
return this.helpShort != null ? this.helpShort : getUsageTranslation().toString();
}
public void setHelpShort(String val) {
@ -85,9 +85,8 @@ public abstract class MCommand<T extends MPlugin> {
public abstract TL getUsageTranslation();
public void setCommandSender(CommandSender sender)
{
this.sender = sender;
public void setCommandSender(CommandSender sender) {
this.sender = sender;
if (sender instanceof Player) {
this.me = (Player) sender;
this.senderIsConsole = false;

2
src/main/java/com/massivecraft/factions/zcore/MPlugin.java
View File

@ -123,7 +123,7 @@ public abstract class MPlugin extends JavaPlugin {
int read;
byte[] bytes = new byte[1024];
while ((read = defLangStream.read(bytes)) != - 1) {
while ((read = defLangStream.read(bytes)) != -1) {
out.write(bytes, 0, read);
}
YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(new BufferedReader(new InputStreamReader(defLangStream)));

6
src/main/java/com/massivecraft/factions/zcore/MPluginSecretPlayerListener.java
View File

@ -18,7 +18,7 @@ public class MPluginSecretPlayerListener implements Listener {
this.p = p;
}
@EventHandler (priority = EventPriority.LOW, ignoreCancelled = true)
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
if (FactionsPlayerListener.preventCommand(event.getMessage(), event.getPlayer())) {
if (p.logPlayerCommands()) {
@ -28,7 +28,7 @@ public class MPluginSecretPlayerListener implements Listener {
}
}
@EventHandler (priority = EventPriority.LOW, ignoreCancelled = true)
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerChat(AsyncPlayerChatEvent event) {
if (p.handleCommand(event.getPlayer(), event.getMessage(), false, true)) {
if (p.logPlayerCommands()) {
@ -45,7 +45,7 @@ public class MPluginSecretPlayerListener implements Listener {
*/
}
@EventHandler (priority = EventPriority.LOWEST)
@EventHandler(priority = EventPriority.LOWEST)
public void onPlayerPreLogin(PlayerLoginEvent event) {
FPlayers.getInstance().getByPlayer(event.getPlayer());
}

6
src/main/java/com/massivecraft/factions/zcore/fperms/Permissable.java
View File

@ -4,10 +4,10 @@ import org.bukkit.inventory.ItemStack;
public interface Permissable {
public ItemStack buildItem();
ItemStack buildItem();
public String replacePlaceholders(String string);
String replacePlaceholders(String string);
public String name();
String name();
}

15
src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java
View File

@ -109,11 +109,16 @@ public enum PermissableAction {
String accessValue = null;
switch (access)
{
case ALLOW: accessValue = "allow"; break;
case DENY: accessValue = "deny"; break;
case UNDEFINED: accessValue = "undefined"; break;
switch (access) {
case ALLOW:
accessValue = "allow";
break;
case DENY:
accessValue = "deny";
break;
case UNDEFINED:
accessValue = "undefined";
break;
}
// If under the 1.13 version we will use the colorable option.

4
src/main/java/com/massivecraft/factions/zcore/fperms/gui/PermissableActionGUI.java
View File

@ -58,7 +58,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
boolean disabled = false;
for (String key : section.getConfigurationSection("slots").getKeys(false)) {
int slot = section.getInt("slots." + key);
if (slot == - 1) {
if (slot == -1) {
disabled = true;
continue;
}
@ -97,7 +97,7 @@ public class PermissableActionGUI implements InventoryHolder, FactionGUI {
actionSlots.put(slot, action);
} else {
int slot = actionGUI.firstEmpty();
if (slot != - 1) {
if (slot != -1) {
actionSlots.put(slot, action);
}
}

2
src/main/java/com/massivecraft/factions/zcore/fperms/gui/PermissableRelationGUI.java
View File

@ -58,7 +58,7 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
for (String key : section.getConfigurationSection("slots").getKeys(false)) {
int slot = section.getInt("slots." + key);
if (slot == - 1) {
if (slot == -1) {
continue;
}
if (slot + 1 > guiSize && slot > 0) {

39
src/main/java/com/massivecraft/factions/zcore/fupgrades/CropUpgrades.java
View File

@ -23,23 +23,27 @@ public class CropUpgrades implements Listener {
Faction factionAtLoc = Board.getInstance().getFactionAt(floc);
if (!factionAtLoc.isWilderness()) {
int level = factionAtLoc.getUpgrade(Upgrade.CROP);
int level = factionAtLoc.getUpgrade(Upgrade.CROP);
if (level != 0) {
int chance = -1;
int chance = -1;
switch (level)
{
case 1: chance = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-1"); break;
case 2: chance = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-2"); break;
case 3: chance = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-3"); break;
}
switch (level) {
case 1:
chance = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-1");
break;
case 2:
chance = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-2");
break;
case 3:
chance = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-3");
break;
}
if (chance >= 0)
{
int randomNum = ThreadLocalRandom.current().nextInt(1, 100 + 1);
if (randomNum <= chance)
growCrop(e);
}
if (chance >= 0) {
int randomNum = ThreadLocalRandom.current().nextInt(1, 100 + 1);
if (randomNum <= chance)
growCrop(e);
}
}
}
}
@ -59,15 +63,14 @@ public class CropUpgrades implements Listener {
if (below.getType() == SavageFactions.plugin.SUGAR_CANE_BLOCK) {
Block above = e.getBlock().getLocation().add(0, 1, 0).getBlock();
if (above.getType() == Material.AIR && above.getLocation().add(0, - 2, 0).getBlock().getType() != Material.AIR) {
if (above.getType() == Material.AIR && above.getLocation().add(0, -2, 0).getBlock().getType() != Material.AIR) {
above.setType(SavageFactions.plugin.SUGAR_CANE_BLOCK);
}
}
else if (below.getType() == Material.CACTUS) {
} else if (below.getType() == Material.CACTUS) {
Block above = e.getBlock().getLocation().add(0, 1, 0).getBlock();
if (above.getType() == Material.AIR && above.getLocation().add(0, - 2, 0).getBlock().getType() != Material.AIR) {
if (above.getType() == Material.AIR && above.getLocation().add(0, -2, 0).getBlock().getType() != Material.AIR) {
above.setType(Material.CACTUS);
}
}

Some files were not shown because too many files have changed in this diff Show More