Skip to content

Fix behaviour of /itemdb on legacy versions #4320

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
pop4959 merged 1 commit into from
Jul 6, 2021
Merged

Fix behaviour of /itemdb on legacy versions #4320

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion Essentials/src/main/java/com/earth2me/essentials/commands/Commanditemdb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.bukkit.Server;
import org.bukkit.inventory.ItemStack;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

Expand Down Expand Up @@ -55,9 +56,13 @@ protected void run(final Server server, final CommandSource sender, final String
}

List<String> nameList = ess.getItemDb().nameList(itemStack);
nameList = nameList != null ? new ArrayList<>(nameList) : new ArrayList<>();
nameList.addAll(ess.getCustomItemResolver().getAliasesFor(ess.getItemDb().name(itemStack)));
Collections.sort(nameList);
if (nameList.isEmpty()) {
return;
}

Collections.sort(nameList);
if (nameList.size() > 15) {
nameList = nameList.subList(0, 14);
}
Expand Down
8 changes: 5 additions & 3 deletions Essentials/src/main/java/com/earth2me/essentials/items/CustomItemResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,11 @@ public Collection<String> getNames() {

public List<String> getAliasesFor(String item) throws Exception {
final List<String> results = new ArrayList<>();
for (Map.Entry<String, String> entry : map.entrySet()) {
if (item.equalsIgnoreCase(ess.getItemDb().name(ess.getItemDb().get(entry.getValue())))) {
results.add(entry.getKey());
if (item != null) {
for (Map.Entry<String, String> entry : map.entrySet()) {
if (item.equalsIgnoreCase(ess.getItemDb().name(ess.getItemDb().get(entry.getValue())))) {
results.add(entry.getKey());
}
}
}
return results;
Expand Down
3 changes: 3 additions & 0 deletions Essentials/src/main/resources/items.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7490,6 +7490,9 @@ sparklymelon,382,0
shiningmelon,382,0
gmelon,382,0
smelon,382,0
mobegg,383,0
spawnegg,383,0
mobspawnegg,383,0
creeperegg,383,50
eggcreeper,383,50
skeletonegg,383,51
Expand Down