fix random item category switching if only one item present
This commit is contained in:
parent
f70f3ad450
commit
c374f35393
1 changed files with 3 additions and 1 deletions
|
@ -1561,18 +1561,20 @@ public class Client implements IThreadListener {
|
||||||
last = 0;
|
last = 0;
|
||||||
this.player.setSelectedIndex(0);
|
this.player.setSelectedIndex(0);
|
||||||
}
|
}
|
||||||
|
boolean any = false;
|
||||||
do {
|
do {
|
||||||
this.player.setSelectedIndex(this.player.getSelectedIndex() + dir);
|
this.player.setSelectedIndex(this.player.getSelectedIndex() + dir);
|
||||||
if(this.player.getSelectedIndex() < 0)
|
if(this.player.getSelectedIndex() < 0)
|
||||||
this.player.setSelectedIndex(this.player.getHotbarSize() - 1);
|
this.player.setSelectedIndex(this.player.getHotbarSize() - 1);
|
||||||
else if(this.player.getSelectedIndex() >= this.player.getHotbarSize())
|
else if(this.player.getSelectedIndex() >= this.player.getHotbarSize())
|
||||||
this.player.setSelectedIndex(0);
|
this.player.setSelectedIndex(0);
|
||||||
|
any |= this.player.getHeldItem() != null && this.player.getHeldItem().getItem().getCategory() == this.itemSelection;
|
||||||
++n;
|
++n;
|
||||||
}
|
}
|
||||||
while((this.player.getHeldItem() == null || this.player.getHeldItem().getItem().getCategory() != this.itemSelection) && n < this.player.getHotbarSize());
|
while((this.player.getHeldItem() == null || this.player.getHeldItem().getItem().getCategory() != this.itemSelection) && n < this.player.getHotbarSize());
|
||||||
if(last != this.player.getSelectedIndex())
|
if(last != this.player.getSelectedIndex())
|
||||||
this.controller.resetUseCooldown();
|
this.controller.resetUseCooldown();
|
||||||
else
|
else if(!any)
|
||||||
this.category(dir);
|
this.category(dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue