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

Custom faction starting balance config in JSON

Browse Source
This commit is contained in:
SvenjaReißaus 2019-03-14 08:56:09 -05:00
parent ce87004ae6
commit 0af0416235
No known key found for this signature in database
GPG Key ID: B14150951DBF6D29
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,6 +240,7 @@ public class Conf {
public static double econCostMap = 0.0; public static double econCostMap = 0.0;
public static double econCostPower = 0.0; public static double econCostPower = 0.0;
public static double econCostShow = 0.0; public static double econCostShow = 0.0;
public static double econFactionStartingBalance = 0.0;
// -------------------------------------------- // // -------------------------------------------- //

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

@ -99,7 +99,7 @@ public class CmdCreate extends FCommand {
msg(TL.COMMAND_CREATE_YOUSHOULD, p.cmdBase.cmdDescription.getUseageTemplate()); msg(TL.COMMAND_CREATE_YOUSHOULD, p.cmdBase.cmdDescription.getUseageTemplate());
if (Conf.econEnabled) { if (Conf.econEnabled) {
Econ.setBalance(faction.getAccountId(), 0); Econ.setBalance(faction.getAccountId(), Conf.econFactionStartingBalance);
} }
if (Conf.logFactionCreate) { if (Conf.logFactionCreate) {

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

@ -657,7 +657,7 @@ public class FactionsPlayerListener implements Listener {
FPlayer fplayer = FPlayers.getInstance().getByPlayer(player); FPlayer fplayer = FPlayers.getInstance().getByPlayer(player);
User user = SavageFactions.plugin.ess.getUser(event.getPlayer()); User user = SavageFactions.plugin.ess.getUser(event.getPlayer());
List<String> homes = user.getHomes(); List<String> homes = user.getHomes();
if (fac.isWilderness() || FPlayers.getInstance().getByPlayer(event.getPlayer()).getFactionId().equals(fac.getId())) { if (fac.isWilderness() || fplayer.getFactionId().equals(fac.getId())) {
return; return;
} }
//Warzone and SafeZone Home Initializers //Warzone and SafeZone Home Initializers