Skip to content

Fix deduplication of version-specific resource packs #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SamB440 merged 1 commit into from
Jan 19, 2026
Merged

Fix deduplication of version-specific resource packs #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions api/src/main/java/com/convallyria/forcepack/api/resourcepack/ResourcePack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,25 @@ public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof ResourcePack)) return false;
ResourcePack that = (ResourcePack) o;
return Objects.equals(uuid, that.uuid) && Objects.equals(getServer(), that.getServer());
return Objects.equals(uuid, that.uuid)
&& Objects.equals(getServer(), that.getServer())
&& sameVersion(packVersion, that.packVersion);
}

@Override
public int hashCode() {
return Objects.hash(uuid, getServer());
return Objects.hash(uuid, getServer(), versionHash(packVersion));
}

private static boolean sameVersion(@Nullable ResourcePackVersion left, @Nullable ResourcePackVersion right) {
if (left == right) return true;
if (left == null || right == null) return false;
return Double.compare(left.min(), right.min()) == 0 && Double.compare(left.max(), right.max()) == 0;
}

private static int versionHash(@Nullable ResourcePackVersion version) {
if (version == null) return 0;
return Objects.hash(version.min(), version.max());
}

@Override
Expand Down