Skip to content
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

Jump to bottom

Allow numbers in the changer for ExprHotbarSlot #6139

Merged
merged 4 commits into from
Oct 22, 2023
Merged

Allow numbers in the changer for ExprHotbarSlot #6139

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6e9ec3
Allow numbers in the changer for ExprHotbarSlot
TheLimeGlass Oct 21, 2023
d27e035
Merge branch 'dev/feature' into enhancement/integer-current-slot
Moderocky Oct 21, 2023
3856562
Update ExprHotbarSlot.java
TheLimeGlass Oct 21, 2023
4800140
Update ExprHotbarSlot.java
TheLimeGlass Oct 22, 2023
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
22 changes: 16 additions & 6 deletions src/main/java/ch/njol/skript/expressions/ExprHotbarSlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,29 @@ public Slot get(Player player) {
@Nullable
public Class<?>[] acceptChange(ChangeMode mode) {
if (mode == ChangeMode.SET)
return new Class[] {Slot.class};
return new Class[] {Slot.class, Number.class};
return null;
}

@Override
public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
assert delta != null;
Slot slot = (Slot) delta[0];
if (!(slot instanceof InventorySlot))
return; // Only inventory slots can be hotbar slots
Object object = delta[0];
Number number = null;
if (object instanceof Slot) {
Slot slot = (Slot) delta[0];
TheLimeGlass marked this conversation as resolved.
Show resolved Hide resolved
if (!(slot instanceof InventorySlot))
TheLimeGlass marked this conversation as resolved.
Show resolved Hide resolved
return; // Only inventory slots can be hotbar slots

number = ((InventorySlot) slot).getIndex();
TheLimeGlass marked this conversation as resolved.
Show resolved Hide resolved
} else if (object instanceof Number) {
number = (Number) object;
}

int index = ((InventorySlot) slot).getIndex();
if (index > 8) // Only slots in hotbar can be current hotbar slot
if (number == null)
return;
int index = number.intValue();
if (index > 8 || index < 0) // Only slots in hotbar can be current hotbar slot
return;

for (Player player : getExpr().getArray(event))
Expand Down