merge: tag 'v1.7.0' into develop

1.7.0 v1.7.0

Signed-off-by: Cristóbal Veas <[email protected]>

Author: zetastormy

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
-projectVersion=1.6.0
+projectVersion=1.7.0
 libsPackage=team.devblook.akropolis.libs

src/main/java/team/devblook/akropolis/module/modules/hotbar/HotbarItem.java

@@ -121,6 +121,7 @@ public void giveItem(Player player) {
         }
 
         player.getInventory().setItem(slot, newItem);
+        hotbarManager.getPlayers().add(player.getUniqueId());
     }
 
     public void removeItem(Player player) {
@@ -135,6 +136,8 @@ public void removeItem(Player player) {
         if (keyValueInItem != null && keyValueInItem.equals(keyValue)) {
             inventory.remove(itemInSlot);
         }
+
+        hotbarManager.getPlayers().remove(player.getUniqueId());
     }
 
     @EventHandler

src/main/java/team/devblook/akropolis/module/modules/hotbar/HotbarManager.java

@@ -129,14 +129,12 @@ public void giveItemsToPlayer(Player player) {
         if (inDisabledWorld(player.getLocation())) return;
 
         hotbarItems.forEach(hotbarItem -> hotbarItem.giveItem(player));
-        players.add(player.getUniqueId());
     }
 
     public void removeItemsFromPlayer(Player player) {
         if (inDisabledWorld(player.getLocation())) return;
 
         hotbarItems.forEach(hotbarItem -> hotbarItem.removeItem(player));
-        players.remove(player.getUniqueId());
     }
 
     public boolean hasHotbar(UUID playerUuid) {
@@ -146,4 +144,8 @@ public boolean hasHotbar(UUID playerUuid) {
     public List<HotbarItem> getHotbarItems() {
         return hotbarItems;
     }
+
+    public Set<UUID> getPlayers() {
+        return players;
+    }
 }