Skip to content

Commit 8d4b0a5

Browse files
Improve the update code of legacy sign
1 parent ddbbc7f commit 8d4b0a5

File tree

1 file changed

+14
-8
lines changed
  • src/main/java/org/maxgamer/quickshop/api/shop

1 file changed

+14
-8
lines changed

src/main/java/org/maxgamer/quickshop/api/shop/Shop.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.jetbrains.annotations.Nullable;
3434
import org.maxgamer.quickshop.QuickShop;
3535
import org.maxgamer.quickshop.api.chat.ComponentPackage;
36+
import org.maxgamer.quickshop.api.localization.text.TextManager;
3637
import org.maxgamer.quickshop.shop.ShopSignPersistentDataType;
3738
import org.maxgamer.quickshop.shop.ShopSignStorage;
3839

@@ -594,18 +595,23 @@ default boolean isShopSign(@NotNull Sign sign, @Nullable Shop shop) {
594595
return false;
595596
}
596597
String header = lines[0];
597-
String adminShopHeader = QuickShop.getInstance().text().of("signs.header", QuickShop.getInstance().text().of("admin-shop").forLocale()).forLocale();
598-
String signHeaderUsername = QuickShop.getInstance().text().of("signs.header", this.ownerName(true)).forLocale();
599-
if (header.contains(adminShopHeader) || header.contains(signHeaderUsername)) {
598+
TextManager textManager=QuickShop.getInstance().text();
599+
String ownerName=this.ownerName(true);
600+
//Raw text matching
601+
String adminShopHeader = textManager.of("signs.header", textManager.of("admin-shop").forLocale()).forLocale();
602+
String userShopHeader = textManager.of("signs.header", ownerName).forLocale();
603+
if (header.contains(adminShopHeader) || header.contains(userShopHeader)) {
600604
return true;
601605
//TEXT SIGN
602606
//continue
603607
} else {
604-
adminShopHeader = QuickShop.getInstance().text().of("signs.header", QuickShop.getInstance().text().of("admin-shop").forLocale(), "").forLocale();
605-
signHeaderUsername = QuickShop.getInstance().text().of("signs.header", this.ownerName(true), "").forLocale();
606-
adminShopHeader = ChatColor.stripColor(adminShopHeader).trim();
607-
signHeaderUsername = ChatColor.stripColor(signHeaderUsername).trim();
608-
return header.contains(adminShopHeader) || header.contains(signHeaderUsername);
608+
//Try no color matching
609+
//arg[0] is name, arg[1] is color code
610+
adminShopHeader = textManager.of("signs.header", textManager.of("admin-shop").forLocale(), "").forLocale();
611+
userShopHeader = textManager.of("signs.header", ownerName, "").forLocale();
612+
adminShopHeader = ChatColor.stripColor(adminShopHeader);
613+
userShopHeader = ChatColor.stripColor(userShopHeader);
614+
return header.contains(adminShopHeader) || header.contains(userShopHeader);
609615
}
610616
}
611617
}

0 commit comments

Comments
 (0)