From 7b69175c0f453038cad8e09fcfe124c7c8681232 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 17 Mar 2016 21:52:37 +0100 Subject: [PATCH] 0.3h Fix userOrder --- .../massivecore/command/type/TypeAbstract.java | 9 ++++++++- src/com/massivecraft/massivecore/util/MUtil.java | 13 +++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java index fcdecb7e..2928dac1 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java +++ b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java @@ -87,7 +87,14 @@ public abstract class TypeAbstract implements Type private List userOrder = null; @Override public void setUserOrder(List userOrder) { this.userOrder = userOrder; } @Override public void setUserOrder(Integer... userOrder) { this.setUserOrder(Arrays.asList(userOrder)); } - @Override public List getUserOrder() { return this.userOrder; } + @Override public List getUserOrder() + { + if (this.userOrder == null) + { + this.userOrder = MUtil.range(0, this.getInnerTypes().size()); + } + return this.userOrder; + } @Override public Integer getIndexUser(int indexTechy) { diff --git a/src/com/massivecraft/massivecore/util/MUtil.java b/src/com/massivecraft/massivecore/util/MUtil.java index 589dc679..0bbb5e1d 100644 --- a/src/com/massivecraft/massivecore/util/MUtil.java +++ b/src/com/massivecraft/massivecore/util/MUtil.java @@ -17,12 +17,12 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.UUID; import java.util.Map.Entry; -import java.util.regex.Pattern; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import java.util.UUID; +import java.util.regex.Pattern; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -554,6 +554,15 @@ public class MUtil } return ret; } + public static List range(int from, int to) + { + List ret = new MassiveList<>(to - from); + for (int i = from; i < to; i++) + { + ret.add(i); + } + return ret; + } public static void keepLeft(List list, int maxlength) {