mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-12-23 01:37:37 +00:00
Don't load clipboard more than once. Deprecate BukkitPlayer constructors as it's more efficient to use cached players
This commit is contained in:
parent
848eac8623
commit
e94b85a0fc
@ -83,7 +83,9 @@ public class BukkitPlayer extends AbstractPlayerActor {
|
||||
* This constructs a new {@link BukkitPlayer} for the given {@link Player}.
|
||||
*
|
||||
* @param player The corresponding {@link Player} or null if you need a null WorldEdit player for some reason.
|
||||
* @deprecated Players are cached by the plugin. Should use {@link WorldEditPlugin#wrapPlayer(Player)}
|
||||
*/
|
||||
@Deprecated
|
||||
public BukkitPlayer(@Nullable Player player) {
|
||||
super(player != null ? getExistingMap(WorldEditPlugin.getInstance(), player) : new ConcurrentHashMap<>());
|
||||
this.plugin = WorldEditPlugin.getInstance();
|
||||
@ -97,15 +99,20 @@ public class BukkitPlayer extends AbstractPlayerActor {
|
||||
*
|
||||
* @param plugin The running instance of {@link WorldEditPlugin}
|
||||
* @param player The corresponding {@link Player} or null if you need a null WorldEdit player for some reason.
|
||||
* @deprecated Players are cached by the plugin. Should use {@link WorldEditPlugin#wrapPlayer(Player)}
|
||||
*/
|
||||
@Deprecated
|
||||
public BukkitPlayer(@Nonnull WorldEditPlugin plugin, @Nullable Player player) {
|
||||
this.plugin = plugin;
|
||||
this.player = player;
|
||||
//FAWE start
|
||||
this.permAttachment = plugin.getPermissionAttachmentManager().getOrAddAttachment(player);
|
||||
if (player != null && Settings.IMP.CLIPBOARD.USE_DISK) {
|
||||
BukkitPlayer cached = WorldEditPlugin.getInstance().getCachedPlayer(player);
|
||||
if (cached == null) {
|
||||
loadClipboardFromDisk();
|
||||
}
|
||||
}
|
||||
//FAWE end
|
||||
}
|
||||
|
||||
|
@ -551,7 +551,7 @@ public class WorldEditPlugin extends JavaPlugin {
|
||||
}
|
||||
|
||||
//FAWE start
|
||||
public BukkitPlayer getCachedPlayer(Player player) {
|
||||
BukkitPlayer getCachedPlayer(Player player) {
|
||||
List<MetadataValue> meta = player.getMetadata("WE");
|
||||
if (meta.isEmpty()) {
|
||||
return null;
|
||||
|
Loading…
Reference in New Issue
Block a user