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

PowerRegenEvent and optimization

Browse Source 
- Add power regeneration event
- Change getNone(), a deprecated method, to getWilderness()
- Optimization
This commit is contained in:
GenialJerome
2018-11-20 20:51:07 +01:00
parent ff6a3b2b1a
commit 5f8ea0bd19
29 changed files with 281 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,11 +39,13 @@ public class CmdChat extends FCommand {
if (modeString != null) {
modeString = modeString.toLowerCase();
// Only allow Mods and higher rank to switch to this channel.
if (modeString.startsWith("m") && fme.getRole().isAtLeast(Role.MODERATOR)) {
modeTarget = ChatMode.MOD;
} else if (modeString.startsWith("m") && !fme.getRole().isAtLeast(Role.MODERATOR)) {
msg(TL.COMMAND_CHAT_MOD_ONLY);
return;
if (modeString.startsWith("m")) {
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")) {
@@ -60,16 +62,13 @@ public class CmdChat extends FCommand {
fme.setChatMode(modeTarget);
if (fme.getChatMode() == ChatMode.MOD) {
msg(TL.COMMAND_CHAT_MODE_MOD);
} else if (fme.getChatMode() == ChatMode.PUBLIC) {
msg(TL.COMMAND_CHAT_MODE_PUBLIC);
} else if (fme.getChatMode() == ChatMode.ALLIANCE) {
msg(TL.COMMAND_CHAT_MODE_ALLIANCE);
} else if (fme.getChatMode() == ChatMode.TRUCE) {
msg(TL.COMMAND_CHAT_MODE_TRUCE);
} else {
msg(TL.COMMAND_CHAT_MODE_FACTION);
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;
}
}

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

@@ -46,7 +46,7 @@ public class CmdList extends FCommand {
}
ArrayList<Faction> factionList = Factions.getInstance().getAllFactions();
factionList.remove(Factions.getInstance().getNone());
factionList.remove(Factions.getInstance().getWilderness());
factionList.remove(Factions.getInstance().getSafeZone());
factionList.remove(Factions.getInstance().getWarZone());
@@ -94,7 +94,7 @@ public class CmdList extends FCommand {
ArrayList<String> lines = new ArrayList<>();
factionList.add(0, Factions.getInstance().getNone());
factionList.add(0, Factions.getInstance().getWilderness());
final int pageheight = 9;
int pagenumber = this.argAsInt(0, 1);

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

@@ -24,7 +24,6 @@ public class CmdPaypalSee extends FCommand {
fme.msg(TL.GENERIC_DISABLED);
} else {
Faction faction = argAsFaction(0);
String paypal = argAsString(1);
if (faction != null) {
if (!faction.isWilderness() && !faction.isSafeZone() && !faction.isWarZone()) {

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

@@ -76,7 +76,7 @@ public class CmdSeeChunk extends FCommand {
taskID = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, new Runnable() {
@Override
public void run() {
Iterator itr = seeChunkMap.keySet().iterator();
Iterator<String> itr = seeChunkMap.keySet().iterator();
while (itr.hasNext()) {
Object nameObject = itr.next();
String name = nameObject + "";

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

@@ -46,9 +46,8 @@ public class CmdTnt extends FCommand {
if (args.size() == 2) {
if (args.get(0).equalsIgnoreCase("add") || args.get(0).equalsIgnoreCase("a")) {
int testNumber = - 1;
try {
testNumber = Integer.parseInt(args.get(1));
Integer.parseInt(args.get(1));
} catch (NumberFormatException e) {
fme.msg(TL.COMMAND_TNT_INVALID_NUM);
return;
@@ -87,9 +86,8 @@ public class CmdTnt extends FCommand {
}
if (args.get(0).equalsIgnoreCase("take") || args.get(0).equalsIgnoreCase("t")) {
int testNumber = - 1;
try {
testNumber = Integer.parseInt(args.get(1));
Integer.parseInt(args.get(1));
} catch (NumberFormatException e) {
fme.msg(TL.COMMAND_TNT_INVALID_NUM);
return;

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

@@ -54,9 +54,9 @@ public class CmdTntFill extends FCommand {
msg(TL.COMMAND_TNTFILL_AMOUNTMAX.toString().replace("{max}", SavageFactions.plugin.getConfig().getInt("Tntfill.max-amount") + ""));
return;
}
int testNumber = - 1;
try {
testNumber = Integer.parseInt(args.get(1));
Integer.parseInt(args.get(1));
} catch (NumberFormatException e) {
fme.msg(TL.COMMAND_TNT_INVALID_NUM);
return;
@@ -124,9 +124,8 @@ public class CmdTntFill extends FCommand {
}
private void removeFromBank(int amount) {
int testNumber = - 1;
try {
testNumber = Integer.parseInt(args.get(1));
Integer.parseInt(args.get(1));
} catch (NumberFormatException e) {
fme.msg(TL.COMMAND_TNT_INVALID_NUM);
return;

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

@@ -29,7 +29,6 @@ public class CmdTpBanner extends FCommand {
return;
}
final FactionsPlayerListener fpl = new FactionsPlayerListener(SavageFactions.plugin);
if (FactionsBlockListener.bannerLocations.containsKey(fme.getTag())) {

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

@@ -15,7 +15,7 @@ import java.util.List;
public abstract class FCommand extends MCommand<SavageFactions> {
public SimpleDateFormat sdf = new SimpleDateFormat(TL.DATE_FORMAT.toString());
public static final SimpleDateFormat sdf = new SimpleDateFormat(TL.DATE_FORMAT.toString());
public boolean disableOnLock;

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

@@ -69,11 +69,6 @@ public class FPromoteCommand extends FCommand {
return;
}
if (promotion == null) {
fme.msg(TL.COMMAND_PROMOTE_NOTTHATPLAYER);
return;
}
// Don't allow people to promote people to their same or higher rnak.
if (fme.getRole().value <= promotion.value) {
fme.msg(TL.COMMAND_PROMOTE_NOT_ALLOWED);