fix

AtomPilz-DevTeam · Jan 8, 2025 · 2d1b06d · 2d1b06d
1 parent 3101f11
commit 2d1b06d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 40 deletions.
diff --git a/src/main/java/de/j/deathMinigames/listeners/AnvilListener.java b/src/main/java/de/j/deathMinigames/listeners/AnvilListener.java
@@ -65,25 +65,23 @@ public void onAnvilClick(InventoryClickEvent event) {
             if (loc == null) return;
             Player player = (Player) event.getWhoClicked();
             if(player == null) return;
+            if(event.getSlot() != 2) return;
             if (MainMenu.getSetHost().compareLocIDTo(loc)) {
                 event.setCancelled(true);
-                if(event.getSlot() == 2) {
-                    if (hostName == null) return;
-                    Tablist.setHostetBy(hostName);
-                    event.getView().close();
-                    DmUtil.getInstance().playSoundAtLocation(player.getLocation(), 0.5f, Sound.BLOCK_ANVIL_USE);
-                    player.sendMessage(Component.text("Host name: " + hostName).color(NamedTextColor.GOLD));
-                }
+                if (hostName == null) return;
+                Tablist.setHostetBy(hostName);
+                event.getView().close();
+                DmUtil.getInstance().playSoundAtLocation(player.getLocation(), 0.5f, Sound.BLOCK_ANVIL_USE);
+                player.sendMessage(Component.text("Host name: " + hostName).color(NamedTextColor.GOLD));
             } else if (MainMenu.getSetServerName().compareLocIDTo(loc)) {
                 event.setCancelled(true);
-                if(event.getSlot() == 2) {
-                    if (serverName == null) return;
-                    Tablist.setServerName(serverName);
-                    event.getView().close();
-                    DmUtil.getInstance().playSoundAtLocation(player.getLocation(), 0.5f, Sound.BLOCK_ANVIL_USE);
-                    player.sendMessage(Component.text("Server name: " + serverName).color(NamedTextColor.GOLD));
-                }
+                if (serverName == null) return;
+                Tablist.setServerName(serverName);
+                event.getView().close();
+                DmUtil.getInstance().playSoundAtLocation(player.getLocation(), 0.5f, Sound.BLOCK_ANVIL_USE);
+                player.sendMessage(Component.text("Server name: " + serverName).color(NamedTextColor.GOLD));
             }
+
         }
     }
 

diff --git a/src/main/java/de/j/deathMinigames/main/Config.java b/src/main/java/de/j/deathMinigames/main/Config.java
@@ -1,14 +1,11 @@
 package de.j.deathMinigames.main;
 
-import de.j.deathMinigames.database.PlayerDataDatabase;
-import de.j.stationofdoom.listener.PlayerJoin;
 import de.j.stationofdoom.util.Tablist;
 import org.bukkit.Location;
 
 import de.j.stationofdoom.main.Main;
 import org.bukkit.World;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.util.*;
 
@@ -345,14 +342,14 @@ public String getServerName() {
         }
     }
 
-    public synchronized void setHostetBy(String serverName) {
+    public synchronized void setHostedBy(String serverName) {
         if(!Main.getPlugin().getConfig().contains("Tablist.HostetBy") || !Main.getPlugin().getConfig().getString("Tablist.HostetBy").equals(serverName)) {
             Main.getPlugin().getConfig().set("Tablist.HostetBy", serverName);
             Main.getPlugin().saveConfig();
         }
     }
 
-    public String getHostetBy() {
+    public String getHostedBy() {
         if(Main.getPlugin().getConfig().contains("Tablist.HostetBy")) {
             return Main.getPlugin().getConfig().getString("Tablist.HostetBy");
         }

diff --git a/src/main/java/de/j/deathMinigames/settings/AnvilUI.java b/src/main/java/de/j/deathMinigames/settings/AnvilUI.java
@@ -25,15 +25,16 @@ public class AnvilUI implements InventoryHolder {
     private MainMenu.AnvilUIs title;
 
     public AnvilUI(MainMenu.AnvilUIs title) {
-        if(title == null) return;
+        if(title == null) throw new IllegalArgumentException("Title cannot be null");
         this.title = title;
         createUniqueLocation();
-        setInputMeta();
     }
 
     public void showInventory(Player playerToShowTheInvTo) {
-        if(playerToShowTheInvTo == null) return;
-        playerToShowTheInvTo.openAnvil(loc, true);
+        this.player = playerToShowTheInvTo;
+        if(player == null) return;
+        player.openAnvil(loc, true);
+        setInputMeta();
         player.getOpenInventory().getTopInventory().setItem(0, input);
     }
 
@@ -59,11 +60,6 @@ public boolean compareLocIDTo(Location loc) {
         return loc.getBlockX() == this.loc.getBlockX() && loc.getBlockZ() == this.loc.getBlockZ();
     }
 
-    public void setPlayerForTranslations(Player player) {
-        this.player = player;
-        setInputMeta();
-    }
-
     private void setInputMeta() {
         ItemMeta inputMeta = input.getItemMeta();
         String inputItemName = null;
@@ -74,6 +70,7 @@ private void setInputMeta() {
             switch (title) {
                 case SET_HOST_NAME -> inputItemName = Tablist.getHostetBy();
                 case SET_SERVER_NAME -> inputItemName = Tablist.getServerName();
+                default -> throw new IllegalArgumentException("Title is not known");
             }
             if(inputItemName == null) {
                 inputMeta.displayName(Component.text(new TranslationFactory().getTranslation(player, "noNameSet")));
@@ -83,8 +80,5 @@ private void setInputMeta() {
             }
         }
         input.setItemMeta(inputMeta);
-        if(player != null) {
-            showInventory(player);
-        }
     }
 }
diff --git a/src/main/java/de/j/deathMinigames/settings/MainMenu.java b/src/main/java/de/j/deathMinigames/settings/MainMenu.java
@@ -105,16 +105,9 @@ public synchronized static AnvilUI getSetServerName() {
      */
     public void showPlayerSettings(Player player) {
         addSubmenus();
-        tellCurrentPlayerToUIs(player);
         showPlayerInv(player);
     }
 
-    private void tellCurrentPlayerToUIs(Player player) {
-        setHost.setPlayerForTranslations(player);
-        setServerName.setPlayerForTranslations(player);
-        Main.getMainLogger().info("Told UIs current player: " + player.getName());
-    }
-
     /**
      * Adds clickable items to the main menu that link to the sub-menus.
      * The items are added in the following order:

diff --git a/src/main/java/de/j/stationofdoom/util/Tablist.java b/src/main/java/de/j/stationofdoom/util/Tablist.java
@@ -176,8 +176,8 @@ else if(!Config.getInstance().getServerName().equals(serverName)) {
 
     public static void setHostetBy(String hostetBy) {
         Tablist.hostetBy = hostetBy;
-        if(Config.getInstance().getHostetBy() == null || !Config.getInstance().getHostetBy().equals(hostetBy)) {
-            Config.getInstance().setHostetBy(hostetBy);
+        if(Config.getInstance().getHostedBy() == null || !Config.getInstance().getHostedBy().equals(hostetBy)) {
+            Config.getInstance().setHostedBy(hostetBy);
         }
     }