diff --git a/src/main/java/me/unurled/sacredrealms/sr/components/player/SRPlayer.java b/src/main/java/me/unurled/sacredrealms/sr/components/player/SRPlayer.java index 87dcc41..8160587 100644 --- a/src/main/java/me/unurled/sacredrealms/sr/components/player/SRPlayer.java +++ b/src/main/java/me/unurled/sacredrealms/sr/components/player/SRPlayer.java @@ -7,6 +7,7 @@ import com.google.gson.annotations.Expose; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.UUID; import me.unurled.sacredrealms.sr.components.attributes.Attribute; import me.unurled.sacredrealms.sr.components.item.Item; @@ -40,10 +41,6 @@ public class SRPlayer { this.uuid = uuid; } - public SRPlayer(@NotNull Player player) { - this.uuid = player.getUniqueId(); - } - @NotNull public UUID getUuid() { return uuid; @@ -59,7 +56,7 @@ public class SRPlayer { } @NotNull - public HashMap getAttributes() { + public Map getAttributes() { return attributes; } @@ -151,14 +148,17 @@ public class SRPlayer { i.setItemMeta(im); } + @SuppressWarnings("unused") public void addPotionEffect(@NotNull PotionEffect effect) { potionEffects.add(effect); } + @SuppressWarnings("unused") public void removePotionEffect(@NotNull PotionEffect effect) { potionEffects.remove(effect); } + @SuppressWarnings("unused") public void clearPotionEffects() { potionEffects.clear(); } @@ -193,6 +193,7 @@ public class SRPlayer { } } + @SuppressWarnings("unused") public @Nullable Double getItemAttributes(@NotNull Attribute attribute, @NotNull ItemStack item) { if (itemAttributes == null) itemAttributes = new HashMap<>(); if (itemAttributes.containsKey(attribute)) { @@ -201,15 +202,17 @@ public class SRPlayer { return null; } - public @NotNull HashMap getItemAttributes(@NotNull Attribute attribute) { + @SuppressWarnings("unused") + public @NotNull Map getItemAttributes(@NotNull Attribute attribute) { if (itemAttributes == null) itemAttributes = new HashMap<>(); return itemAttributes.getOrDefault(attribute, new HashMap<>()); } - public @NotNull HashMap getItemAttributes(Item item) { + @SuppressWarnings("unused") + public @NotNull Map getItemAttributes(Item item) { if (itemAttributes == null) itemAttributes = new HashMap<>(); HashMap map = new HashMap<>(); - itemAttributes.forEach((k, v) -> map.put(k, v.get(item))); + itemAttributes.forEach((k, v) -> map.put(k, v.getOrDefault(item.toItemStack(), 0d))); return map; }