TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 20:00:46 +00:00
Code Issues Projects Releases Wiki Activity

Save materials in unlimited by name

Browse source 
There was a mistake where materials in unlimited would instead be saved
as a bukkit Material instead of its name. Instead, save it by the name.
This commit is contained in:
Joe Hirschfeld 2019-10-04 22:24:01 -07:00 committed by md678685
parent a4182b5ff9
commit b3a54a78bc
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Essentials/src/com/earth2me/essentials/UserData.java
View file

@ -17,6 +17,7 @@ import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static com.earth2me.essentials.I18n.tl; import static com.earth2me.essentials.I18n.tl;
@ -234,10 +235,10 @@ public abstract class UserData extends PlayerExtension implements IConf {
config.save(); config.save();
} }
private List<Material> unlimited; private Set<Material> unlimited;
private List<Material> _getUnlimited() { private Set<Material> _getUnlimited() {
List<Material> retlist = new ArrayList<>(); Set<Material> retlist = new HashSet<>();
List<String> configList = config.getStringList("unlimited"); List<String> configList = config.getStringList("unlimited");
for(String s : configList) { for(String s : configList) {
Material mat = Material.matchMaterial(s); Material mat = Material.matchMaterial(s);
@ -249,7 +250,7 @@ public abstract class UserData extends PlayerExtension implements IConf {
return retlist; return retlist;
} }
public List<Material> getUnlimited() { public Set<Material> getUnlimited() {
return unlimited; return unlimited;
} }
@ -258,13 +259,20 @@ public abstract class UserData extends PlayerExtension implements IConf {
} }
public void setUnlimited(ItemStack stack, boolean state) { public void setUnlimited(ItemStack stack, boolean state) {
if (unlimited.contains(stack.getType())) { boolean wasUpdated;
unlimited.remove(stack.getType());
}
if (state) { if (state) {
unlimited.add(stack.getType()); wasUpdated = unlimited.add(stack.getType());
} else {
wasUpdated = unlimited.remove(stack.getType());
} }
config.setProperty("unlimited", unlimited);
if (wasUpdated) {
applyUnlimited();
}
}
private void applyUnlimited() {
config.setProperty("unlimited", unlimited.stream().map(Enum::name).collect(Collectors.toList()));
config.save(); config.save();
} }

14
Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
View file

@ -5,8 +5,10 @@ import org.bukkit.Material;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Set;
import static com.earth2me.essentials.I18n.tl; import static com.earth2me.essentials.I18n.tl;
@ -32,14 +34,10 @@ public class Commandunlimited extends EssentialsCommand {
final String list = getList(target); final String list = getList(target);
user.sendMessage(list); user.sendMessage(list);
} else if (args[0].equalsIgnoreCase("clear")) { } else if (args[0].equalsIgnoreCase("clear")) {
final List<Material> itemList = target.getUnlimited(); final Set<Material> itemList = new HashSet<>(target.getUnlimited());
int index = 0; for (Material m : itemList) {
while (itemList.size() > index) { toggleUnlimited(user, target, m.toString());
final Material item = itemList.get(index);
if (!toggleUnlimited(user, target, item.toString())) {
index++;
}
} }
} else { } else {
toggleUnlimited(user, target, args[0]); toggleUnlimited(user, target, args[0]);
@ -50,7 +48,7 @@ public class Commandunlimited extends EssentialsCommand {
final StringBuilder output = new StringBuilder(); final StringBuilder output = new StringBuilder();
output.append(tl("unlimitedItems")).append(" "); output.append(tl("unlimitedItems")).append(" ");
boolean first = true; boolean first = true;
final List<Material> items = target.getUnlimited(); final Set<Material> items = target.getUnlimited();
if (items.isEmpty()) { if (items.isEmpty()) {
output.append(tl("none")); output.append(tl("none"));
} }