diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/order/OrderActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/order/OrderActionImpl.java index 5d18719623..9cc8472342 100644 --- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/order/OrderActionImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/order/OrderActionImpl.java @@ -208,6 +208,8 @@ public M moveTo(int position) { Checks.notNegative(position, "Provided position"); Checks.check(position < orderList.size(), "Provided position is too big and is out of bounds."); + if (selectedPosition == -1) + throw new IllegalStateException("Cannot move until an item has been selected. Use #selectPosition first."); T selectedItem = orderList.remove(selectedPosition); orderList.add(position, selectedItem); @@ -250,6 +252,8 @@ public M swapPosition(int swapPosition) Checks.notNegative(swapPosition, "Provided swapPosition"); Checks.check(swapPosition < orderList.size(), "Provided swapPosition is too big and is out of bounds. swapPosition: " + swapPosition); + if (selectedPosition == -1) + throw new IllegalStateException("Cannot move until an item has been selected. Use #selectPosition first."); T selectedItem = orderList.get(selectedPosition); T swapItem = orderList.get(swapPosition);