SNAPSHOT-0.5.2

Correction de bugs

Author: TT54

src/fr/tt54/country/cmd/subcommand/CmdBank.java

@@ -84,7 +84,7 @@ public boolean onExecute(CommandSender sender, SubCommand subCommand, String com
 
                 try {
                     double amount = Math.abs(Double.parseDouble(args[1]));
-                    if (country.getMoney() >= amount) {
+                    if (country.hasMoney(amount)) {
                         EconomyManager.playerWithdraw(player, country, amount);
                         sender.sendMessage(Main.getMessages().getMessage("moneywithdraw", "%money%", Main.getEconomy().format(amount)));
                         return true;

src/fr/tt54/country/cmd/subcommand/CmdForfeit.java

@@ -61,7 +61,7 @@ public boolean onExecute(CommandSender sender, SubCommand subCommand, String com
 
         if (Main.isEconomySetup()) {
             double forfeitCost = Main.getInstance().getForfeitCost();
-            if (country.getMoney() < forfeitCost) {
+            if (!country.hasMoney(forfeitCost)) {
                 sender.sendMessage(Main.getMessages().getMessage("notenoughtoforfeit", "%cost%", Main.getEconomy().format(forfeitCost), "%country%", args[0]));
                 return false;
             }

src/fr/tt54/country/listener/PlayerListener.java

@@ -18,7 +18,7 @@
 
 public class PlayerListener implements Listener {
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onChat(AsyncPlayerChatEvent event) {
         if (Main.getInstance().getConfig().getBoolean("enablechat")) {
             String format = Main.getInstance().getConfig().getString("chatformat");

src/fr/tt54/country/manager/EconomyManager.java

@@ -43,7 +43,7 @@ public static boolean playerDeposit(Player player, Country country, double amoun
     public static boolean playerWithdraw(Player player, Country country, double amount) {
         if (Main.isEconomySetup()) {
             Economy economy = Main.getEconomy();
-            if (country.getMoney() >= amount) {
+            if (country.hasMoney(amount)) {
                 economy.depositPlayer(player, amount);
                 country.removeMoney(amount);
                 saveMoney(country);

src/fr/tt54/country/manager/InviteManager.java

@@ -18,7 +18,7 @@
 public class InviteManager {
 
     private static FileConfiguration invitesFile;
-    private static List<Invite> invites = new ArrayList<>();
+    private static final List<Invite> invites = new ArrayList<>();
 
     public static void enable() {
         reloadInvites();

src/fr/tt54/country/manager/WarManager.java

@@ -93,9 +93,7 @@ public static void startWar(Country country1, Country country2) {
     }
 
     public static List<War> getWarsBetween(Country country1, Country country2) {
-        return getWars(country1.getUuid()).stream().filter(war -> {
-            return war.getCountry2() == country2 || war.getCountry1() == country2;
-        }).collect(Collectors.toList());
+        return getWars(country1.getUuid()).stream().filter(war -> war.getCountry2() == country2 || war.getCountry1() == country2).collect(Collectors.toList());
     }
 
     public static War getActualWarBetween(Country country1, Country country2) {

src/fr/tt54/country/objects/country/Country.java

@@ -14,7 +14,7 @@ public class Country {
 
     private UUID uuid;
     private String name;
-    private Map<UUID, Rank> members = new HashMap<>();
+    private final Map<UUID, Rank> members = new HashMap<>();
     private UUID leader;
     private int level;
     private int points;
@@ -27,9 +27,9 @@ public class Country {
     private double money;
     private int levelPoints;
 
-    private Map<UUID, Relations> relations = new HashMap<>();
-    private Map<UUID, Relations> relationsRequests = new HashMap<>();
-    private Map<Relations, List<ClaimPermission>> relationsPermissions = new HashMap<>();
+    private final Map<UUID, Relations> relations = new HashMap<>();
+    private final Map<UUID, Relations> relationsRequests = new HashMap<>();
+    private final Map<Relations, List<ClaimPermission>> relationsPermissions = new HashMap<>();
 
 
     public Country(UUID uuid, String name, OfflinePlayer leader, List<Rank> ranks) {
@@ -370,6 +370,10 @@ public void addMoney(double amount) {
         this.money += amount;
     }
 
+    public boolean hasMoney(double amount) {
+        return this.money >= amount;
+    }
+
     public void removeMoney(double amount) {
         this.money -= amount;
     }

src/fr/tt54/country/objects/country/Invite.java

@@ -7,9 +7,9 @@
 
 public class Invite {
 
-    private UUID playerUUID;
-    private UUID senderUUID;
-    private Country country;
+    private final UUID playerUUID;
+    private final UUID senderUUID;
+    private final Country country;
 
     public Invite(UUID playerUUID, UUID senderUUID, Country country) {
         this.playerUUID = playerUUID;

src/fr/tt54/country/objects/country/Rank.java

@@ -11,7 +11,7 @@ public class Rank {
     private String name;
     private String prefix;
     private int power;
-    private List<CountryPermission> countryPermissions = new ArrayList<>();
+    private final List<CountryPermission> countryPermissions = new ArrayList<>();
     public static List<Rank> defaultRanks = new ArrayList<>();
 
     public Rank(String name, String prefix, int power) {

src/fr/tt54/country/objects/country/Relations.java

@@ -11,7 +11,7 @@ public enum Relations {
     ENTENTE("Entente", "§e"),
     ALLY("Ally", "§d");
 
-    private static Map<String, Relations> relationsMap = new HashMap<>();
+    private static final Map<String, Relations> relationsMap = new HashMap<>();
 
     static {
         for (Relations rel : Relations.values()) {

src/fr/tt54/country/objects/permissions/ClaimPermission.java

@@ -14,7 +14,7 @@ public enum ClaimPermission {
     INTERACT("Interact with other blocks in this claim.");
 
 
-    private String description;
+    private final String description;
 
     ClaimPermission(String description) {
         this.description = description;

src/fr/tt54/country/objects/permissions/CountryPermission.java

@@ -24,7 +24,7 @@ public enum CountryPermission {
     OPEN_DOOR("Open doors and trapdoors in faction's claims."),
     INTERACT("Interact with other blocks in faction's claims.");
 
-    private String description;
+    private final String description;
 
     CountryPermission(String description) {
         this.description = description;

src/fr/tt54/country/utils/materials/InterVersionMaterial.java

@@ -2,11 +2,11 @@
 
 public class InterVersionMaterial {
 
-    private int startVersion;
-    private int endVersion;
-    private String name;
-    private MaterialCategory materialCategory;
-    private String materialName;
+    private final int startVersion;
+    private final int endVersion;
+    private final String name;
+    private final MaterialCategory materialCategory;
+    private final String materialName;
 
     public InterVersionMaterial(String name, MaterialCategory materialCategory, String materialName, int startVersion, int endVersion) {
         this.startVersion = startVersion;

src/fr/tt54/country/utils/materials/MaterialUtils.java

@@ -11,8 +11,8 @@
 
 public class MaterialUtils {
 
-    private static Map<MaterialCategory, List<InterVersionMaterial>> materials = new HashMap<>();
-    private static Map<String, List<InterVersionMaterial>> materialsWithName = new HashMap<>();
+    private static final Map<MaterialCategory, List<InterVersionMaterial>> materials = new HashMap<>();
+    private static final Map<String, List<InterVersionMaterial>> materialsWithName = new HashMap<>();
 
     public static void registerMaterials() {
         registerMaterial(new InterVersionMaterial("BUTTON", MaterialCategory.BUTTON, "WOOD_BUTTON", -1, 12));

src/message.yml

@@ -19,6 +19,7 @@ nocountry: "&cYou must have a country to execute this command !"
 alreadyincountry: "&cYou are already in a country (%country%) !"
 playerhascountry: "&cThis player is already in a country"
 playernotinyourcountry: "&cThe targeted player is not in your country"
+#New
 playernotinacountry: "&cThe targeted player is not in a country"
 countryuuidnotexist: "&cThe country with the UUID %countryuuid% does not exist"
 countrynotexist: "&cThe country %country% does not exist"
@@ -118,10 +119,12 @@ warally: "&cYou started a &2war&c with %country% because you are in &dally&c wit
 relationsyourself: "&cYou can't edit your relations with yourself !"
 warwon: "&eThe country &d%winner%&e won the &cwar&e between &6%country1% and %country2% !"
 useforfeit: "&cTo stop a war, you can use /country forfeit"
+#new
 notenoughtoforfeit: "&cYou don't have enough money (%cost%) to forfeit the war against %country% !"
 
 donthavemoney: "&cYou don't have enough money (%money%) !"
 moneydeposit: "&aYou deposed %money% in you country bank !"
 countrydoesnthavemoney: "&cYour country doesn't have enough money (%money%) !"
 moneywithdraw: "&aYou removed %money% in you country bank !"
+#new
 countrybankfull: "&cThe bank of your country is full and can't have more money !"

src/plugin.yml

@@ -1,7 +1,7 @@
 main: fr.tt54.country.Main
 name: Country
 author: TT54
-version: SNAPSHOT-0.5.1
+version: SNAPSHOT-0.5.2
 api-version: 1.13
 commands:
   country: