EpicKnarvik97/Factions3
EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix regarding message when setting tax

Browse Source
This commit is contained in:
Magnus Ulf 2021-03-03 21:22:36 +01:00
parent 735d875aa6
commit c3ab3c1bd2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/Rel.java
View File

@ -40,7 +40,7 @@ public enum Rel implements Colorized, Named, MPerm.MPermable
"your faction", "your faction", "your faction", "your faction", "your faction", "your faction", "your faction", "your faction",
"Faction" "Faction"
) { @Override public ChatColor getColor() { return MConf.get().colorMember; } }, ) { @Override public ChatColor getColor() { return MConf.get().colorMember; } },
// END OF LIST // END OF LIST
; ;

3
src/com/massivecraft/factions/cmd/CmdFactionsTaxSet.java
View File

@ -7,6 +7,7 @@ import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.MPlayerColl;
import com.massivecraft.factions.entity.Rank; import com.massivecraft.factions.entity.Rank;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.type.primitive.TypeDouble; import com.massivecraft.massivecore.command.type.primitive.TypeDouble;
@ -53,7 +54,7 @@ public class CmdFactionsTaxSet extends FactionsCommand
if ( ! MPerm.getPermTax().has(msender, faction, true)) return; if ( ! MPerm.getPermTax().has(msender, faction, true)) return;
Rank rank = faction.getRank(taxable); Rank rank = faction.getRank(taxable);
MPlayer mplayer = MPlayer.get(taxable); MPlayer mplayer = MPlayerColl.get().get(taxable, false);
String name; String name;
if (Faction.IDENTIFIER_TAX_BASE.equalsIgnoreCase(taxable)) name = "Default"; if (Faction.IDENTIFIER_TAX_BASE.equalsIgnoreCase(taxable)) name = "Default";