From d381b9084538b8f618706ce44700ed59364da2ee Mon Sep 17 00:00:00 2001
From: NotSoDelayed <72163224+NotSoDelayed@users.noreply.github.com>
Date: Tue, 17 Sep 2024 21:59:59 +0800
Subject: [PATCH] Requested changes

---
 .../njol/skript/expressions/ExprMaxStack.java | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/main/java/ch/njol/skript/expressions/ExprMaxStack.java b/src/main/java/ch/njol/skript/expressions/ExprMaxStack.java
index 27e119489a7..133c536456e 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMaxStack.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMaxStack.java
@@ -22,8 +22,8 @@
 
 @Name("Maximum Stack Size")
 @Description({
-	"The maximum stack size of an item (e.g. 64 for torches, 16 for buckets, and 1 for swords), or of an inventory to have items to stack up to.",
-	"Since MC 1.20.5 onwards, the maximum stack size of items can be changed (any integer from 1 to 99), and the said item can be stacked up to the set value, up to the maximum stack size of an inventory."
+	"The maximum stack size of an item (e.g. 64 for torches, 16 for buckets, 1 for swords, etc.) or inventory.",
+	"In 1.20.5+, the maximum stack size of items can be changed to any integer from 1 to 99, and stacked up to the maximum stack size of the inventory they're in."
 })
 @Examples({
 	"send \"You can only pick up %max stack size of player's tool% of %type of (player's tool)%\" to player",
@@ -42,8 +42,7 @@ public class ExprMaxStack extends SimplePropertyExpression<Object, Integer> {
 	private static final boolean CHANGEABLE_ITEM_STACK_SIZE = Skript.methodExists(ItemMeta.class, "setMaxStackSize", Integer.class);
 
 	@Override
-	@Nullable
-	public Integer convert(Object from) {
+	public @Nullable Integer convert(Object from) {
 		if (from instanceof ItemType itemType)
 			return getMaxStackSize(itemType);
 		if (from instanceof Inventory inventory)
@@ -52,8 +51,7 @@ public Integer convert(Object from) {
 	}
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
         return switch (mode) {
             case ADD, REMOVE, RESET, SET -> {
                 if (!CHANGEABLE_ITEM_STACK_SIZE && ItemType.class.isAssignableFrom(getExpr().getReturnType())) {
@@ -68,24 +66,18 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 
 	@Override
 	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Integer change = null;
+		if (mode != ChangeMode.RESET)
+			change = (int) delta[0];
 		for (Object source : getExpr().getArray(event)) {
-			Integer change = null;
-			if (mode != ChangeMode.RESET)
-				change = (int) delta[0];
 			if (source instanceof ItemType itemType) {
 				if (!CHANGEABLE_ITEM_STACK_SIZE)
 					continue;
 				int size = getMaxStackSize(itemType);
                 switch (mode) {
-                    case ADD:
-						size += change;
-                        break;
-                    case SET:
-						size = change;
-						break;
-                    case REMOVE:
-						size -= change;
-                        break;
+                    case ADD -> size += change;
+                    case SET -> size = change;
+                    case REMOVE -> size -= change;
                 }
 				ItemMeta meta = itemType.getItemMeta();
 				// Minecraft only accepts stack size from 1 to 99