Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-10-31 07:51:05 +01:00
Code Issues Projects Releases Wiki Activity

Split up chat messages sent to console containing new lines

Browse Source
This commit is contained in:
Luck 2017-04-23 20:51:24 +01:00
parent a526c942ca
commit 7c398d2c67
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java
View File

@ -28,6 +28,8 @@ package me.lucko.luckperms.common.commands.sender;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import com.google.common.base.Splitter;
import me.lucko.luckperms.common.constants.Constants; import me.lucko.luckperms.common.constants.Constants;
import me.lucko.luckperms.common.constants.Permission; import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@ -45,6 +47,8 @@ import java.util.UUID;
@Getter @Getter
@EqualsAndHashCode(of = "uuid") @EqualsAndHashCode(of = "uuid")
public final class AbstractSender<T> implements Sender { public final class AbstractSender<T> implements Sender {
private static final Splitter NEW_LINE_SPLITTER = Splitter.on("\n");
private final LuckPermsPlugin platform; private final LuckPermsPlugin platform;
private final SenderFactory<T> factory; private final SenderFactory<T> factory;
private final WeakReference<T> ref; private final WeakReference<T> ref;
@ -63,12 +67,26 @@ public final class AbstractSender<T> implements Sender {
public void sendMessage(String s) { public void sendMessage(String s) {
final T t = ref.get(); final T t = ref.get();
if (t != null) { if (t != null) {
if (!isConsole()) {
factory.sendMessage(t, s); factory.sendMessage(t, s);
return;
}
// if it is console, split up the lines and send individually.
for (String line : NEW_LINE_SPLITTER.split(s)) {
factory.sendMessage(t, line);
}
} }
} }
@Override @Override
public void sendMessage(FancyMessage message) { public void sendMessage(FancyMessage message) {
if (isConsole()) {
sendMessage(message.toOldMessageFormat());
return;
}
final T t = ref.get(); final T t = ref.get();
if (t != null) { if (t != null) {
factory.sendMessage(t, message); factory.sendMessage(t, message);