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

ItemFrame Fix, Claiming with No Power Double Check, Scoreboard Duplicate Double Check modified BlockListener

Browse Source
This commit is contained in:
Driftay
2020-04-06 10:32:16 -04:00
parent 8d1b26e561
commit 0c5cc3a978
28 changed files with 151 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,9 +4,9 @@ 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.zcore.frame.fdisband.FDisbandFrame;
import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.frame.fdisband.FDisbandFrame;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.command.ConsoleCommandSender;
@@ -103,7 +103,7 @@ public class CmdDisband extends FCommand {
follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
}
}
if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")){
if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
faction.disband(context.player, PlayerDisbandReason.COMMAND);
context.fPlayer.setFFlying(false, false);
return;

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

@@ -86,9 +86,9 @@ public class CmdFly extends FCommand {
checkEnemiesSync(fPlayer);
}
FLocation myFloc = new FLocation(player.getLocation());
if (!checkFly(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
disableFlightSync(fPlayer);
}
if (!checkFly(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
disableFlightSync(fPlayer);
}
}
}

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

@@ -4,8 +4,8 @@ import com.google.common.collect.Lists;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.zcore.frame.FactionGUI;
import com.massivecraft.factions.util.XMaterial;
import com.massivecraft.factions.zcore.frame.FactionGUI;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.DyeColor;
import org.bukkit.event.inventory.ClickType;

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

@@ -3,8 +3,8 @@ package com.massivecraft.factions.cmd.check;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.zcore.frame.FactionGUI;
import com.massivecraft.factions.util.XMaterial;
import com.massivecraft.factions.zcore.frame.FactionGUI;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;
import org.bukkit.event.inventory.ClickType;

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

@@ -83,7 +83,6 @@ public class CmdClaim extends FCommand {
this.stop();
return false;
}
return true;
}
};

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

@@ -37,7 +37,7 @@ public class CmdMoneyDeposit extends FCommand {
double amount = context.argAsDouble(0, 0d);
EconomyParticipator faction = context.argAsFaction(1, context.faction);
if(amount <= 0){
if (amount <= 0) {
return;
}

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

@@ -34,7 +34,7 @@ public class CmdMoneyTransferFf extends FCommand {
public void perform(CommandContext context) {
double amount = context.argAsDouble(0, 0d);
if(amount <= 0){
if (amount <= 0) {
return;
}

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

@@ -33,7 +33,7 @@ public class CmdMoneyTransferFp extends FCommand {
public void perform(CommandContext context) {
double amount = context.argAsDouble(0, 0d);
if(amount <= 0){
if (amount <= 0) {
return;
}

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

@@ -33,7 +33,7 @@ public class CmdMoneyTransferPf extends FCommand {
public void perform(CommandContext context) {
double amount = context.argAsDouble(0, 0d);
if(amount <= 0){
if (amount <= 0) {
return;
}

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

@@ -40,7 +40,7 @@ public class CmdMoneyWithdraw extends FCommand {
public void perform(CommandContext context) {
double amount = context.argAsDouble(0, 0d);
if(amount <= 0){
if (amount <= 0) {
return;
}

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

@@ -32,7 +32,7 @@ public class CmdPointsBalance extends FCommand {
if (context.argIsSet(0)) {
faction = context.argAsFaction(0);
} else if(context.faction.isNormal()){
} else if (context.faction.isNormal()) {
context.msg(TL.COMMAND_POINTS_SHOW_OWN, context.faction.getPoints());
return;
} else {

1
src/main/java/com/massivecraft/factions/cmd/tnt/CmdTntFill.java
View File

@@ -20,7 +20,6 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
public class CmdTntFill extends FCommand {

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

@@ -2,10 +2,10 @@ package com.massivecraft.factions.cmd.wild;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FactionsPlugin;
import com.massivecraft.factions.util.XMaterial;
import com.massivecraft.factions.util.wait.WaitExecutor;
import com.massivecraft.factions.util.wait.WaitTask;
import com.massivecraft.factions.zcore.frame.FactionGUI;
import com.massivecraft.factions.util.XMaterial;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;