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

Few minor changes

Browse Source
This commit is contained in:
DroppingAnvil 2020-03-25 13:35:50 -05:00 committed by droppinganvil
parent a086f8db7a
commit 3d997bbf16
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ public class Conf {
public static final transient double DYNMAP_STYLE_FILL_OPACITY = 0.35D; public static final transient double DYNMAP_STYLE_FILL_OPACITY = 0.35D;
public static final transient String DYNMAP_STYLE_HOME_MARKER = "greenflag"; public static final transient String DYNMAP_STYLE_HOME_MARKER = "greenflag";
public static final transient boolean DYNMAP_STYLE_BOOST = false; public static final transient boolean DYNMAP_STYLE_BOOST = false;
public static List<String> baseCommandAliases = new ArrayList<>(); public static List<String> baseCommandAliases = new ArrayList<>(Collections.singletonList("f"));
public static boolean allowNoSlashCommand = true; public static boolean allowNoSlashCommand = true;
// Colors // Colors
@ -411,7 +411,6 @@ public class Conf {
} }
static { static {
baseCommandAliases.add("f");
blacklistedFactionNames.add("somenamehere"); blacklistedFactionNames.add("somenamehere");

1
src/main/java/com/massivecraft/factions/FactionsPlugin.java
View File

@ -202,6 +202,7 @@ public class FactionsPlugin extends MPlugin {
divider(); divider();
return; return;
} }
//TODO fix this
//Update their config if needed //Update their config if needed
// Updater.updateIfNeeded(getConfig()); // Updater.updateIfNeeded(getConfig());
RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class); RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class);

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

@ -34,7 +34,7 @@ public class CmdWild extends FCommand implements WaitedTask {
public CmdWild() { public CmdWild() {
super(); super();
if (this.instance == null) instance = this; if (instance == null) instance = this;
this.aliases.addAll(Aliases.wild); this.aliases.addAll(Aliases.wild);
this.requirements = new CommandRequirements.Builder(Permission.WILD) this.requirements = new CommandRequirements.Builder(Permission.WILD)
.playerOnly() .playerOnly()

2
src/main/java/com/massivecraft/factions/duels/Duel.java
View File

@ -99,6 +99,8 @@ public class Duel {
Duels.duel = new Duel(fvf.getKey(), fvf.getValue()); Duels.duel = new Duel(fvf.getKey(), fvf.getValue());
Duels.preparingDuel = true; Duels.preparingDuel = true;
Duels.acceptedDuel.clear(); Duels.acceptedDuel.clear();
Duels.sendRequests(faction1);
Duels.sendRequests(faction2);
} }
} }

4
src/main/java/com/massivecraft/factions/duels/Duels.java
View File

@ -60,8 +60,8 @@ public class Duels {
return new Location(Bukkit.getWorld(locKeyArray[0]), Double.parseDouble(locKeyArray[1]), Double.parseDouble(locKeyArray[2]), Double.parseDouble(locKeyArray[3])); return new Location(Bukkit.getWorld(locKeyArray[0]), Double.parseDouble(locKeyArray[1]), Double.parseDouble(locKeyArray[2]), Double.parseDouble(locKeyArray[3]));
} }
public void sendRequests() { public static void sendRequests(Faction faction) {
for (FPlayer fplayer : duel.getFaction1().getFPlayers()) { for (FPlayer fplayer : faction.getFPlayers()) {
if (fplayer.isOnline()) { if (fplayer.isOnline()) {
fplayer.getPlayer().openInventory(RequestGUI.inv); fplayer.getPlayer().openInventory(RequestGUI.inv);
guiMap.put(fplayer, System.currentTimeMillis()); guiMap.put(fplayer, System.currentTimeMillis());