add holder argument to getKeyFromActor

Topper-MC · Jan 30, 2025 · 57fc8fb · 57fc8fb
1 parent c2d58e5
commit 57fc8fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/query/snapshot/src/main/java/me/hsgamer/topper/query/snapshot/SnapshotQueryManager.java b/query/snapshot/src/main/java/me/hsgamer/topper/query/snapshot/SnapshotQueryManager.java
@@ -56,16 +56,16 @@ protected SnapshotQueryManager() {
             return getDisplayValue(value, holder, "raw");
         });
         registerActorFunction("top_rank", (actor, holder) -> {
-            int index = getSnapshotAgent(holder).getSnapshotIndex(getKeyFromActor(actor));
+            int index = getSnapshotAgent(holder).getSnapshotIndex(getKeyFromActor(actor, holder));
             return Integer.toString(index + 1);
         });
         registerAction("value", (actor, holder, args) -> {
             if (actor == null) return null;
-            V value = holder.getEntry(getKeyFromActor(actor)).map(DataEntry::getValue).orElse(null);
+            V value = holder.getEntry(getKeyFromActor(actor, holder)).map(DataEntry::getValue).orElse(null);
             return getDisplayValue(value, holder, args);
         });
         registerActorFunction("value_raw", (actor, holder) -> {
-            V value = holder.getEntry(getKeyFromActor(actor)).map(DataEntry::getValue).orElse(null);
+            V value = holder.getEntry(getKeyFromActor(actor, holder)).map(DataEntry::getValue).orElse(null);
             return getDisplayValue(value, holder, "raw");
         });
     }
@@ -83,5 +83,5 @@ protected SnapshotQueryManager() {
     protected abstract String getDisplayKey(@Nullable K key, @NotNull H holder);
 
     @NotNull
-    protected abstract K getKeyFromActor(@NotNull A actor);
+    protected abstract K getKeyFromActor(@NotNull A actor, @NotNull H holder);
 }
diff --git a/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/manager/TopQueryManager.java b/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/manager/TopQueryManager.java
@@ -44,7 +44,7 @@ protected Optional<NumberTopHolder> getHolder(String name) {
     }
 
     @Override
-    protected @NotNull UUID getKeyFromActor(@NotNull OfflinePlayer actor) {
+    protected @NotNull UUID getKeyFromActor(@NotNull OfflinePlayer actor, @NotNull NumberTopHolder holder) {
         return actor.getUniqueId();
     }
 }