Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-09-30 14:27:29 +02:00
Code Issues Projects Releases Wiki Activity

Don't use a WeakReference to hold platform sender objects (#2838)

Browse Source
This commit is contained in:
Luck 2021-01-21 12:58:59 +00:00
parent cd496fdc39
commit 20fee360fb
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@ import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.luckperms.api.util.Tristate;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@ -47,24 +46,24 @@ import java.util.UUID;
* @param <T> the command sender type
*/
public final class AbstractSender<T> implements Sender {
private final LuckPermsPlugin platform;
private final LuckPermsPlugin plugin;
private final SenderFactory<?, T> factory;
private final WeakReference<T> sender;
private final T sender;
private final UUID uniqueId;
private final String name;
AbstractSender(LuckPermsPlugin platform, SenderFactory<?, T> factory, T t) {
this.platform = platform;
AbstractSender(LuckPermsPlugin plugin, SenderFactory<?, T> factory, T sender) {
this.plugin = plugin;
this.factory = factory;
this.sender = new WeakReference<>(t);
this.uniqueId = factory.getUniqueId(t);
this.name = factory.getName(t);
this.sender = sender;
this.uniqueId = factory.getUniqueId(this.sender);
this.name = factory.getName(this.sender);
}
@Override
public LuckPermsPlugin getPlugin() {
return this.platform;
return this.plugin;
}
@Override
@ -79,51 +78,33 @@ public final class AbstractSender<T> implements Sender {
@Override
public void sendMessage(Component message) {
final T sender = this.sender.get();
if (sender != null) {
if (isConsole()) {
for (Component line : splitNewlines(message)) {
this.factory.sendMessage(sender, line);
}
} else {
this.factory.sendMessage(sender, message);
if (isConsole()) {
for (Component line : splitNewlines(message)) {
this.factory.sendMessage(this.sender, line);
}
} else {
this.factory.sendMessage(this.sender, message);
}
}
@Override
public Tristate getPermissionValue(String permission) {
T sender = this.sender.get();
if (sender != null) {
return this.factory.getPermissionValue(sender, permission);
}
return isConsole() ? Tristate.TRUE : Tristate.UNDEFINED;
return this.factory.getPermissionValue(this.sender, permission);
}
@Override
public boolean hasPermission(String permission) {
T sender = this.sender.get();
if (sender != null) {
if (this.factory.hasPermission(sender, permission)) {
return true;
}
}
return isConsole();
return this.factory.hasPermission(this.sender, permission);
}
@Override
public void performCommand(String commandLine) {
T sender = this.sender.get();
if (sender != null) {
this.factory.performCommand(sender, commandLine);
}
this.factory.performCommand(this.sender, commandLine);
}
@Override
public boolean isValid() {
return this.sender.get() != null;
return isConsole() || this.plugin.getBootstrap().isPlayerOnline(this.uniqueId);
}
@Override