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

Option to remove permissions from perm gui.

Browse Source 
bStats tracking
Admins are demoted coleaders instead of mods
Changed fly for loop to iterator to avoid concurrent exceptions
This commit is contained in:
Naman
2018-03-27 08:17:55 -05:00
parent b92202e86b
commit 3d2bf73497
11 changed files with 725 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ public class CmdAdmin extends FCommand {
// promote target player, and demote existing admin if one exists
if (admin != null) {
admin.setRole(Role.MODERATOR);
admin.setRole(Role.COLEADER);
}
fyou.setRole(Role.ADMIN);
msg(TL.COMMAND_ADMIN_PROMOTES, fyou.describeTo(fme, true));

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

@@ -52,13 +52,12 @@ public class CmdCheckpoint extends FCommand {
} else {
fme.msg(TL.COMMAND_CHECKPOINT_CLAIMED);
}
this.doWarmUp(WarmUpUtil.Warmup.WARP, TL.WARMUPS_NOTIFY_TELEPORT, "Checkpoint", new Runnable() {
this.doWarmUp(WarmUpUtil.Warmup.CHECKPOINT, TL.WARMUPS_NOTIFY_TELEPORT, "Checkpoint", new Runnable() {
@Override
public void run() {
// Create a smoke effect
CmdCheckpoint.this.me.teleport(fme.getFaction().getCheckpoint());
}
}, this.p.getConfig().getLong("warmups.f-checkpoint", 0));
}, this.p.getConfig().getLong("warmups.f-checkpoint", 10));
}

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

@@ -11,8 +11,9 @@ import org.bukkit.GameMode;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import java.sql.BatchUpdateException;
import java.util.*;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
public class CmdFly extends FCommand {
@@ -182,7 +183,10 @@ public class CmdFly extends FCommand {
flyid = Bukkit.getScheduler().scheduleSyncRepeatingTask(P.p, new Runnable() {
@Override
public void run() {
for (String name : flyMap.keySet()) {
Iterator itr = flyMap.keySet().iterator();
while (itr.hasNext()) {
Object nameObj = itr.next();
String name = nameObj + "";
Player player = Bukkit.getPlayer(name);
if (player == null) { continue;}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
@@ -212,7 +216,7 @@ public class CmdFly extends FCommand {
}
checkTaskState();
checkTaskState();
}
}
},20L,20L);