|
32 | 32 | import net.md_5.bungee.api.chat.TranslatableComponent; |
33 | 33 | import net.md_5.bungee.chat.ComponentSerializer; |
34 | 34 | 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; |
36 | 42 | import org.bukkit.block.Block; |
37 | 43 | import org.bukkit.block.BlockFace; |
38 | 44 | import org.bukkit.block.BlockState; |
|
66 | 72 | import org.yaml.snakeyaml.DumperOptions; |
67 | 73 | import org.yaml.snakeyaml.Yaml; |
68 | 74 |
|
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; |
70 | 82 | import java.lang.management.ManagementFactory; |
71 | 83 | import java.nio.charset.StandardCharsets; |
72 | 84 | import java.nio.file.Files; |
|
75 | 87 | import java.time.LocalDate; |
76 | 88 | import java.time.LocalDateTime; |
77 | 89 | 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; |
79 | 98 | 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; |
80 | 104 | import java.util.concurrent.TimeUnit; |
81 | 105 | import java.util.concurrent.locks.ReentrantReadWriteLock; |
82 | 106 | import java.util.logging.Level; |
@@ -684,7 +708,12 @@ public static void initialize() { |
684 | 708 | if (mat == null) { |
685 | 709 | plugin.getLogger().warning("Invalid shop-block: " + s); |
686 | 710 | } 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 | + } |
688 | 717 | } |
689 | 718 | } |
690 | 719 | List<String> configBlacklist = plugin.getConfig().getStringList("blacklist"); |
|
0 commit comments