Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-01 02:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor upstream changes and obviously more command work

Browse Source
This commit is contained in:
MattBDev
2019-07-23 19:17:38 -04:00
parent 9816eb3102
commit 01c371df9c
13 changed files with 144 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormat.java
View File

@ -19,21 +19,20 @@
package com.sk89q.worldedit.extent.clipboard.io;
import static com.google.common.base.Preconditions.checkNotNull;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.object.RunnableVal;
import com.boydti.fawe.object.clipboard.URIClipboardHolder;
import com.boydti.fawe.object.io.PGZIPOutputStream;
import com.boydti.fawe.object.schematic.Schematic;
import com.boydti.fawe.util.MainUtil;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.gson.Gson;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.math.BlockVector3;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@ -111,8 +110,8 @@ public interface ClipboardFormat {
* @param in
* @throws IOException
*/
default URIClipboardHolder hold(Player player, URI uri, InputStream in) throws IOException {
checkNotNull(player);
default URIClipboardHolder hold(Actor actor, URI uri, InputStream in) throws IOException {
checkNotNull(actor);
checkNotNull(uri);
checkNotNull(in);
@ -120,9 +119,9 @@ public interface ClipboardFormat {
final Clipboard clipboard;
LocalSession session = WorldEdit.getInstance().getSessionManager().get(player);
LocalSession session = WorldEdit.getInstance().getSessionManager().get(actor);
session.setClipboard(null);
clipboard = reader.read(player.getUniqueId());
clipboard = reader.read(actor.getUniqueId());
URIClipboardHolder holder = new URIClipboardHolder(uri, clipboard);
session.setClipboard(holder);
return holder;