mirror of
https://github.com/EngineHub/WorldGuard.git
synced 2024-09-28 22:57:29 +02:00
Allow newlines in blacklist messages with \n.
Fixes WORLDGUARD-4089.
This commit is contained in:
parent
6e30f98322
commit
c4b31cf085
@ -54,12 +54,7 @@ public class Blacklist {
|
||||
private LoadingCache<String, TrackedEvent> repeatingEventCache = CacheBuilder.newBuilder()
|
||||
.maximumSize(1000)
|
||||
.expireAfterAccess(30, TimeUnit.SECONDS)
|
||||
.build(new CacheLoader<String, TrackedEvent>() {
|
||||
@Override
|
||||
public TrackedEvent load(String s) throws Exception {
|
||||
return new TrackedEvent();
|
||||
}
|
||||
});
|
||||
.build(CacheLoader.from(TrackedEvent::new));
|
||||
|
||||
public Blacklist(boolean useAsWhitelist) {
|
||||
this.useAsWhitelist = useAsWhitelist;
|
||||
|
@ -43,6 +43,7 @@ protected ActionResult applyNonRepeated(BlacklistEvent event, boolean silent) {
|
||||
|
||||
if (event.getPlayer() != null) {
|
||||
if (message != null) {
|
||||
message = message.replaceAll("(?!<\\\\)\\\\n", "\n").replaceAll("\\\\\\\\n", "\\n");
|
||||
event.getPlayer().print(String.format(message, event.getTarget().getFriendlyName()));
|
||||
} else {
|
||||
event.getPlayer().printError("You're not allowed to " + event.getDescription() + " " + event.getTarget().getFriendlyName() + ".");
|
||||
|
Loading…
Reference in New Issue
Block a user