Skip to content

Commit d6a9068

Browse files
authored
Fix per-player configuration (#818)
1 parent 85997c0 commit d6a9068

File tree

1 file changed

+2
-2
lines changed
  • inventory-framework-api/src/main/java/me/devnatan/inventoryframework

1 file changed

+2
-2
lines changed

inventory-framework-api/src/main/java/me/devnatan/inventoryframework/ViewConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ private <T> T merge(ViewConfig other, Function<ViewConfig, T> retriever) {
154154
}
155155

156156
private <T> T merge(ViewConfig other, Function<ViewConfig, T> retriever, Function<T, Boolean> mergeCondition) {
157-
T value = retriever.apply(other);
158-
if (!mergeCondition.apply(value)) return retriever.apply(this);
157+
T value = retriever.apply(this);
158+
if (!mergeCondition.apply(value)) return retriever.apply(other);
159159
return value;
160160
}
161161

0 commit comments

Comments
 (0)