Version 3.2.9

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>fun.lewisdev</groupId>
     <artifactId>DeluxeHub</artifactId>
-    <version>3.2.7</version>
+    <version>3.2.9</version>
     <packaging>jar</packaging>
 
     <name>DeluxeHub</name>

src/main/java/fun/lewisdev/deluxehub/action/actions/SoundAction.java

@@ -16,7 +16,7 @@ public String getIdentifier() {
     @Override
     public void execute(DeluxeHub plugin, Player player, String data) {
         try {
-            XSound.matchXSound(data).get().playSound(player);
+            player.playSound(player.getLocation(), XSound.matchXSound(data).get().parseSound(), 1L, 1L);
         } catch (Exception ex) {
             Bukkit.getLogger().warning("[DeluxeHub Action] Invalid sound name: " + data.toUpperCase());
         }

src/main/java/fun/lewisdev/deluxehub/inventory/AbstractInventory.java

@@ -28,7 +28,7 @@ public AbstractInventory(DeluxeHub plugin) {
 
     public void setInventoryRefresh(long value) {
         if (value <= 0) return;
-        plugin.getServer().getScheduler().runTaskTimer(plugin, new InventoryTask(this), 0L, value);
+        plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new InventoryTask(this), 0L, value);
         refreshEnabled = true;
     }
 
@@ -40,8 +40,7 @@ protected DeluxeHub getPlugin() {
         return plugin;
     }
 
-    public void refreshInventory(Player player, Inventory inventory) {
-
+    public Inventory refreshInventory(Player player, Inventory inventory) {
         for (int i = 0; i < inventory.getSize(); i++) {
             ItemStack item = getInventory().getItem(i);
             if (item == null || item.getType() == Material.AIR || !item.hasItemMeta()) continue;
@@ -51,15 +50,14 @@ public void refreshInventory(Player player, Inventory inventory) {
             if (item.getItemMeta().hasLore()) newItem.withLore(item.getItemMeta().getLore(), player);
             inventory.setItem(i, newItem.build());
         }
+        return inventory;
     }
 
     public void openInventory(Player player) {
         if (getInventory() == null) return;
 
-        player.openInventory(getInventory());
-        refreshInventory(player, player.getOpenInventory().getTopInventory());
+        player.openInventory(refreshInventory(player, getInventory()));
         if (refreshEnabled && !openInventories.contains(player.getUniqueId())) {
-            //System.out.println("added " + player.getName());
             openInventories.add(player.getUniqueId());
         }
     }

src/main/java/fun/lewisdev/deluxehub/module/modules/hotbar/HotbarItem.java

@@ -86,11 +86,10 @@ public void onInventoryClick(InventoryClickEvent event) {
         if (!allowMovement) return;
 
         Player player = (Player) event.getWhoClicked();
-        ItemStack clicked = event.getCurrentItem();
+        if (getHotbarManager().inDisabledWorld(player.getLocation())) return;
 
+        ItemStack clicked = event.getCurrentItem();
         if (clicked == null || clicked.getType() == Material.AIR) return;
-        else if (getHotbarManager().inDisabledWorld(player.getLocation())) return;
-        else if (event.getCursor() == null || event.getCursor().getType() == Material.AIR) return;
 
         if (event.getSlot() == slot && new NBTItem(clicked).getString("hotbarItem").equals(key))
             event.setCancelled(true);
@@ -105,8 +104,8 @@ public void hotbarItemInteract(PlayerInteractEvent event) {
         ItemStack item = player.getItemInHand();
 
         if (getHotbarManager().inDisabledWorld(player.getLocation())) return;
-        if (item == null || item.getType() == Material.AIR) return;
-        if (!new NBTItem(item).getString("hotbarItem").equals(key)) return;
+        else if (item.getType() == Material.AIR) return;
+        else if (!new NBTItem(item).getString("hotbarItem").equals(key)) return;
 
         onInteract(player);
     }

src/main/java/fun/lewisdev/deluxehub/module/modules/visual/tablist/TablistManager.java

@@ -58,16 +58,14 @@ public void createTablist(Player player) {
         updateTablist(uuid);
     }
 
-    public void updateTablist(UUID uuid) {
-        if (!players.contains(uuid)) return;
+    public boolean updateTablist(UUID uuid) {
+        if (!players.contains(uuid)) return false;
 
         Player player = Bukkit.getPlayer(uuid);
-        if (player == null) {
-            players.remove(uuid);
-            return;
-        }
+        if (player == null) return false;
 
         TablistHelper.sendTabList(player, PlaceholderUtil.setPlaceholders(header, player), PlaceholderUtil.setPlaceholders(footer, player));
+        return true;
     }
 
     public void removeTablist(Player player) {

src/main/java/fun/lewisdev/deluxehub/module/modules/visual/tablist/TablistUpdateTask.java

@@ -1,5 +1,9 @@
 package fun.lewisdev.deluxehub.module.modules.visual.tablist;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 public class TablistUpdateTask implements Runnable {
 
     private TablistManager tablistManager;
@@ -10,7 +14,11 @@ public TablistUpdateTask(TablistManager tablistManager) {
 
     @Override
     public void run() {
-        tablistManager.getPlayers().forEach(uuid -> tablistManager.updateTablist(uuid));
+        List<UUID> toRemove = new ArrayList<>();
+        tablistManager.getPlayers().forEach(uuid -> {
+            if (!tablistManager.updateTablist(uuid)) toRemove.add(uuid);
+        });
+        tablistManager.getPlayers().removeAll(toRemove);
     }
 
 }

src/main/java/fun/lewisdev/deluxehub/module/modules/world/WorldProtect.java

@@ -254,7 +254,7 @@ public void onBlockInteract(PlayerInteractEvent event) {
             event.setCancelled(true);
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler
     public void onEntityDamage(EntityDamageEvent event) {
         if (!fallDamage) return;
         if (!(event.getEntity() instanceof Player)) return;

src/main/java/fun/lewisdev/deluxehub/utility/ItemStackBuilder.java

@@ -29,8 +29,7 @@ public ItemStackBuilder(ItemStack item) {
         this.ITEM_STACK = item;
     }
 
-    public static ItemStackBuilder getItemStack(ConfigurationSection section) {
-
+    public static ItemStackBuilder getItemStack(ConfigurationSection section, Player player) {
         ItemStack item = XMaterial.matchXMaterial(section.getString("material")).get().parseItem();
 
         if (item.getType() == XMaterial.PLAYER_HEAD.parseMaterial()) {
@@ -52,11 +51,13 @@ public static ItemStackBuilder getItemStack(ConfigurationSection section) {
         }
 
         if (section.contains("display_name")) {
-            builder.withName(section.getString("display_name"));
+            if (player != null) builder.withName(section.getString("display_name"), player);
+            else builder.withName(section.getString("display_name"));
         }
 
         if (section.contains("lore")) {
-            builder.withLore(section.getStringList("lore"));
+            if (player != null) builder.withLore(section.getStringList("lore"), player);
+            else builder.withLore(section.getStringList("lore"));
         }
 
         if (section.contains("glow") && section.getBoolean("glow")) {
@@ -78,6 +79,10 @@ public static ItemStackBuilder getItemStack(ConfigurationSection section) {
         return builder;
     }
 
+    public static ItemStackBuilder getItemStack(ConfigurationSection section) {
+        return getItemStack(section, null);
+    }
+
     public ItemStackBuilder withAmount(int amount) {
         ITEM_STACK.setAmount(amount);
         return this;

src/main/resources/plugin.yml

@@ -40,7 +40,7 @@ permissions:
       deluxehub.bypass.commands: true
       deluxehub.bypass.lockchat: true
       deluxehub.bypass.antiwdl: true
-      deluxehub.bypass.doublejump: true
+      deluxehub.bypass.doublejump: false
   deluxehub.alert.*:
     description: Gives access to all alert permissions
     children: