Fixed player manager.

Former-commit-id: 7d351d7
awumii · Dec 14, 2019 · 9a8be34 · 9a8be34
1 parent 91ca936
commit 9a8be34
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>pl.polskistevek</groupId>
     <artifactId>EpicGuard</artifactId>
-    <version>2.2.0</version>
+    <version>2.1.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/pl/polskistevek/guard/bukkit/GuardPluginBukkit.java b/src/main/java/pl/polskistevek/guard/bukkit/GuardPluginBukkit.java
@@ -119,7 +119,7 @@ public void onEnable() {
 
             // Creating GUI's
             GuiMain.i = Bukkit.createInventory(null, 45, "EpicGuard Management Menu");
-            GuiPlayers.inv = Bukkit.createInventory(null, 45, "EpicGuard Player Manager");
+            GuiPlayers.inv = Bukkit.createInventory(null, 36, "EpicGuard Player Manager");
 
             Logger.info("Succesfully loaded! Took: " + (System.currentTimeMillis() - ms) + "ms", false);
         } catch (Exception e) {

diff --git a/src/main/java/pl/polskistevek/guard/bukkit/gui/GuiPlayers.java b/src/main/java/pl/polskistevek/guard/bukkit/gui/GuiPlayers.java
@@ -48,7 +48,9 @@ public static void show(Player p) {
             } else {
                 itemStack = new ItemBuilder(Material.IRON_HELMET).setTitle("&a" + player.getName()).addLores(lore).build();
             }
+            ItemStack back = new ItemBuilder(Material.ARROW).setTitle("&cBack to main menu").addLore("").addLore("&7Click to go back.").build();
             inv.setItem(i, itemStack);
+            inv.setItem(35, back);
             i++;
         }
         p.openInventory(inv);

diff --git a/src/main/java/pl/polskistevek/guard/bukkit/listener/InventoryClickListener.java b/src/main/java/pl/polskistevek/guard/bukkit/listener/InventoryClickListener.java
@@ -5,18 +5,19 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.meta.ItemMeta;
+import pl.polskistevek.guard.bukkit.gui.GuiMain;
 import pl.polskistevek.guard.bukkit.gui.GuiPlayers;
 
 public class InventoryClickListener implements Listener {
     @EventHandler
-    public void onClick(InventoryClickEvent e) {
-        Player p = (Player) e.getWhoClicked();
-        if (e.getView().getTitle().equals("EpicGuard Management Menu")) {
-            e.setCancelled(true);
-            if (e.getCurrentItem() == null) {
+    public void onClick(InventoryClickEvent event) {
+        Player p = (Player) event.getWhoClicked();
+        if (event.getView().getTitle().equals("EpicGuard Management Menu")) {
+            event.setCancelled(true);
+            if (event.getCurrentItem() == null) {
                 return;
             }
-            ItemMeta im = e.getCurrentItem().getItemMeta();
+            ItemMeta im = event.getCurrentItem().getItemMeta();
             if (im == null) {
                 return;
             }
@@ -27,8 +28,17 @@ public void onClick(InventoryClickEvent e) {
                 p.getOpenInventory().close();
             }
         }
-        if (e.getView().getTitle().equals("EpicGuard Player Manager")) {
-            e.setCancelled(true);
+        if (event.getView().getTitle().equals("EpicGuard Player Manager")) {
+            if (event.getCurrentItem() == null) {
+                return;
+            }
+            if (event.getCurrentItem().getItemMeta() == null) {
+                return;
+            }
+            if (event.getCurrentItem().getItemMeta().getDisplayName().contains("Back to main menu")){
+                GuiMain.show(p);
+            }
+            event.setCancelled(true);
         }
     }
 }
diff --git a/src/main/java/pl/polskistevek/guard/bukkit/task/ActionBarTask.java b/src/main/java/pl/polskistevek/guard/bukkit/task/ActionBarTask.java
@@ -3,6 +3,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import pl.polskistevek.guard.bukkit.gui.GuiMain;
+import pl.polskistevek.guard.bukkit.gui.GuiPlayers;
 import pl.polskistevek.guard.bukkit.manager.AttackManager;
 import pl.polskistevek.guard.bukkit.util.MessagesBukkit;
 import pl.polskistevek.guard.bukkit.util.Notificator;
@@ -17,7 +18,7 @@ public void run() {
                 GuiMain.show(p);
             }
             if (p.getOpenInventory().getTitle().equals("EpicGuard Player Manager")) {
-                GuiMain.show(p);
+                GuiPlayers.show(p);
             }
         }
         if (AttackManager.connectPerSecond == 0) {

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: EpicGuard
 version: 2.1.0
-main: pl.polskistevek.guard.bukkit.BukkitMain
+main: pl.polskistevek.guard.bukkit.GuardPluginBukkit
 softdepend: [ProtocolLib]
 author: PolskiStevek
 description: Increase your server security. Fast and effective, Block bots, griefers, Bungeecord Supported!