From 35c23c79706635e8d1a20446671a3057ebf70b16 Mon Sep 17 00:00:00 2001
From: William <will27528@gmail.com>
Date: Thu, 11 Apr 2024 19:16:27 +0100
Subject: [PATCH] refactor: remove some unused code, cleanup

---
 .../net/william278/husksync/data/BukkitData.java     | 12 ++++++++----
 .../main/java/net/william278/husksync/data/Data.java |  4 ----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java b/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
index 3075a658..30a6be96 100644
--- a/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
+++ b/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
@@ -448,9 +448,8 @@ public abstract class BukkitData implements Data {
         @NotNull
         public static BukkitData.Statistics adapt(@NotNull Player player) {
             final Map<String, Integer> generic = Maps.newHashMap();
-            final Map<String, Map<String, Integer>> blocks = Maps.newHashMap();
-            final Map<String, Map<String, Integer>> items = Maps.newHashMap();
-            final Map<String, Map<String, Integer>> entities = Maps.newHashMap();
+            final Map<String, Map<String, Integer>> blocks = Maps.newHashMap(),
+                    items = Maps.newHashMap(), entities = Maps.newHashMap();
             Registry.STATISTIC.forEach(id -> {
                 switch (id.getType()) {
                     case UNTYPED -> addStatistic(player, id, generic);
@@ -585,8 +584,13 @@ public abstract class BukkitData implements Data {
             return attributes.stream().filter(attribute -> attribute.name().equals(id.getKey().toString())).findFirst();
         }
 
+        @SuppressWarnings("unused")
         public Optional<Attribute> getAttribute(@NotNull String key) {
-            return getAttribute(matchAttribute(key));
+            final org.bukkit.attribute.Attribute attribute = matchAttribute(key);
+            if (attribute == null) {
+                return Optional.empty();
+            }
+            return getAttribute(attribute);
         }
 
         @NotNull
diff --git a/common/src/main/java/net/william278/husksync/data/Data.java b/common/src/main/java/net/william278/husksync/data/Data.java
index da267389..fc4de513 100644
--- a/common/src/main/java/net/william278/husksync/data/Data.java
+++ b/common/src/main/java/net/william278/husksync/data/Data.java
@@ -266,10 +266,6 @@ public interface Data {
 
         @NotNull
         Map<String, Map<String, Integer>> getEntityStatistics();
-
-        record StatisticsMap(
-        ) {
-        }
     }
 
     /**