Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2025-01-03 13:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Ignore signs and transactions made by players with invalid names

Browse Source
This commit is contained in:
Phoenix616 2020-11-18 15:10:58 +01:00
parent 2305c759b8
commit 435bf0f3cc
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/Acrobot/ChestShop/ChestShop.java
View File

@ -319,6 +319,7 @@ public class ChestShop extends JavaPlugin {
registerEvent(new AmountAndPriceChecker()); registerEvent(new AmountAndPriceChecker());
} }
registerEvent(new InvalidNameIgnorer());
registerEvent(new CreativeModeIgnorer()); registerEvent(new CreativeModeIgnorer());
registerEvent(new ErrorMessageSender()); registerEvent(new ErrorMessageSender());
registerEvent(new PermissionChecker()); registerEvent(new PermissionChecker());

26
src/main/java/com/Acrobot/ChestShop/Listeners/PreTransaction/InvalidNameIgnorer.java Normal file
View File

@ -0,0 +1,26 @@
package com.Acrobot.ChestShop.Listeners.PreTransaction;
import com.Acrobot.ChestShop.Events.PreTransactionEvent;
import com.Acrobot.ChestShop.Signs.ChestShopSign;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import java.util.regex.Pattern;
public class InvalidNameIgnorer implements Listener {
private final static Pattern USERNAME_PATTERN = Pattern.compile("^\\w+$");
@EventHandler(priority = EventPriority.LOWEST)
public static void onPreTransaction(PreTransactionEvent event) {
if (event.isCancelled()) {
return;
}
String name = event.getClient().getName();
if (ChestShopSign.isAdminShop(name) || !USERNAME_PATTERN.matcher(name).matches()) {
event.setCancelled(PreTransactionEvent.TransactionOutcome.CLIENT_DOES_NOT_HAVE_PERMISSION);
}
}
}

4
src/main/java/com/Acrobot/ChestShop/Signs/ChestShopSign.java
View File

@ -26,10 +26,10 @@ public class ChestShopSign {
public static final byte ITEM_LINE = 3; public static final byte ITEM_LINE = 3;
public static final Pattern[] SHOP_SIGN_PATTERN = { public static final Pattern[] SHOP_SIGN_PATTERN = {
Pattern.compile("^?[\\w -.:]*$"), Pattern.compile("^?[\\w \\-.:]*$"),
Pattern.compile("^[1-9][0-9]{0,5}$"), Pattern.compile("^[1-9][0-9]{0,5}$"),
Pattern.compile("(?i)^[\\d.bs(free) :]+$"), Pattern.compile("(?i)^[\\d.bs(free) :]+$"),
Pattern.compile("^[\\w? #:-]+$") Pattern.compile("^[\\w? #:\\-]+$")
}; };
public static final String AUTOFILL_CODE = "?"; public static final String AUTOFILL_CODE = "?";