ranks gui

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'sh.okx'
-version '3.10-alpha'
+version '3.10-alpha.1'
 
 repositories {
     mavenCentral()

src/main/java/sh/okx/rankup/RankupHelper.java

@@ -1,5 +1,8 @@
 package sh.okx.rankup;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import sh.okx.rankup.hook.GroupProvider;
@@ -11,10 +14,6 @@ import sh.okx.rankup.ranks.Rank;
 import sh.okx.rankup.ranks.RankElement;
 import sh.okx.rankup.ranks.Rankups;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
 /**
  * Actually performs the ranking up and prestiging for the plugin and also manages the cooldowns
  * between ranking up.
@@ -36,12 +35,12 @@ public class RankupHelper {
   }
 
   public void doRankup(Player player, RankElement<Rank> rank) {
-    rank.getRank().runCommands(player);
-
     if (rank.getRank() != null) {
       permissions.removeGroup(player.getUniqueId(), rank.getRank().getRank());
     }
     permissions.addGroup(player.getUniqueId(), rank.getNext().getRank().getRank());
+
+    rank.getRank().runCommands(player);
   }
 
   public void sendRankupMessages(Player player, RankElement<Rank> rank) {
@@ -57,7 +56,6 @@ public class RankupHelper {
 
   public void doPrestige(Player player, RankElement<Prestige> prestige) {
     Prestige rank = prestige.getRank();
-    rank.runCommands(player);
 
     permissions.removeGroup(player.getUniqueId(), rank.getFrom());
     permissions.addGroup(player.getUniqueId(), rank.getTo());
@@ -66,6 +64,8 @@ public class RankupHelper {
       permissions.removeGroup(player.getUniqueId(), rank.getRank());
     }
     permissions.addGroup(player.getUniqueId(), prestige.getNext().getRank().getRank());
+
+    rank.runCommands(player);
   }
 
   public void sendPrestigeMessages(Player player, RankElement<Prestige> prestige) {

src/main/java/sh/okx/rankup/commands/RankupCommand.java

@@ -64,7 +64,7 @@ public class RankupCommand implements CommandExecutor {
       case "gui":
         Gui gui = Gui.of(player, rankElement.getRank(), rankElement.getNext().getRank(), plugin, args.length > 0 && args[0].equalsIgnoreCase("gui"));
         if (gui == null) {
-          player.sendMessage(ChatColor.RED + "GUI is not available. Check console for more informatiopn.");
+          player.sendMessage(ChatColor.RED + "GUI is not available. Check console for more information.");
           return true;
         }
         gui.open(player);

src/main/java/sh/okx/rankup/ranksgui/RanksGuiListener.java

@@ -35,8 +35,8 @@ public class RanksGuiListener implements Listener {
     Player player = (Player) event.getWhoClicked();
     RanksGui ranksGui = guiMap.get(player);
     if (ranksGui != null && event.getInventory() == ranksGui.getInventory()) {
-      ranksGui.click(event);
       event.setCancelled(true);
+      ranksGui.click(event);
     }
   }