OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

#753: RecipeIterator#hasNext will now accurately represent if the current iterator has a next item.

Browse source
This commit is contained in:
Martoph 2020-09-18 18:43:48 +10:00 committed by md_5
parent 890130b460
commit da9bb3ea92
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
View file

@ -19,13 +19,23 @@ public class RecipeIterator implements Iterator<Recipe> {
@Override @Override
public boolean hasNext() { public boolean hasNext() {
return (current != null && current.hasNext()) || recipes.hasNext(); if (current != null && current.hasNext()) {
return true;
}
if (recipes.hasNext()) {
current = recipes.next().getValue().values().iterator();
return hasNext();
}
return false;
} }
@Override @Override
public Recipe next() { public Recipe next() {
if (current == null || !current.hasNext()) { if (current == null || !current.hasNext()) {
current = recipes.next().getValue().values().iterator(); current = recipes.next().getValue().values().iterator();
return next();
} }
return current.next().toBukkitRecipe(); return current.next().toBukkitRecipe();