Skip to content

Commit 75d113e

Browse files
PotatoCraft-Studio#248 Force enable enchance-shop-protect when using SHULKER as shop-block
1 parent 53bb114 commit 75d113e

File tree

1 file changed

+33
-4
lines changed
  • src/main/java/org/maxgamer/quickshop/util

1 file changed

+33
-4
lines changed

src/main/java/org/maxgamer/quickshop/util/Util.java

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@
3232
import net.md_5.bungee.api.chat.TranslatableComponent;
3333
import net.md_5.bungee.chat.ComponentSerializer;
3434
import org.apache.commons.lang3.StringUtils;
35-
import org.bukkit.*;
35+
import org.bukkit.Bukkit;
36+
import org.bukkit.DyeColor;
37+
import org.bukkit.Location;
38+
import org.bukkit.Material;
39+
import org.bukkit.OfflinePlayer;
40+
import org.bukkit.Tag;
41+
import org.bukkit.World;
3642
import org.bukkit.block.Block;
3743
import org.bukkit.block.BlockFace;
3844
import org.bukkit.block.BlockState;
@@ -66,7 +72,13 @@
6672
import org.yaml.snakeyaml.DumperOptions;
6773
import org.yaml.snakeyaml.Yaml;
6874

69-
import java.io.*;
75+
import java.io.BufferedWriter;
76+
import java.io.ByteArrayOutputStream;
77+
import java.io.File;
78+
import java.io.FileInputStream;
79+
import java.io.FileWriter;
80+
import java.io.IOException;
81+
import java.io.InputStream;
7082
import java.lang.management.ManagementFactory;
7183
import java.nio.charset.StandardCharsets;
7284
import java.nio.file.Files;
@@ -75,8 +87,20 @@
7587
import java.time.LocalDate;
7688
import java.time.LocalDateTime;
7789
import java.util.AbstractMap.SimpleEntry;
78-
import java.util.*;
90+
import java.util.ArrayList;
91+
import java.util.Arrays;
92+
import java.util.Collections;
93+
import java.util.EnumMap;
94+
import java.util.EnumSet;
95+
import java.util.Iterator;
96+
import java.util.List;
97+
import java.util.Map;
7998
import java.util.Map.Entry;
99+
import java.util.Objects;
100+
import java.util.Set;
101+
import java.util.StringJoiner;
102+
import java.util.TimeZone;
103+
import java.util.UUID;
80104
import java.util.concurrent.TimeUnit;
81105
import java.util.concurrent.locks.ReentrantReadWriteLock;
82106
import java.util.logging.Level;
@@ -684,7 +708,12 @@ public static void initialize() {
684708
if (mat == null) {
685709
plugin.getLogger().warning("Invalid shop-block: " + s);
686710
} else {
687-
SHOPABLES.add(mat);
711+
if (!mat.name().contains("SHULKER")) {
712+
SHOPABLES.add(mat);
713+
} else {
714+
plugin.getConfig().set("shop.enchance-shop-protect", true);
715+
plugin.getLogger().log(java.util.logging.Level.SEVERE, "enchance-shop-protect settings was forced enabled to prevent the piston bug, see: https://github.com/PotatoCraft-Studio/QuickShop-Reremake/issues/248");
716+
}
688717
}
689718
}
690719
List<String> configBlacklist = plugin.getConfig().getStringList("blacklist");

0 commit comments

Comments
 (0)