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

Selective merge of commanding branch.

Browse Source
This commit is contained in:
MattBDev
2019-10-23 12:58:36 -04:00
parent 8768085479
commit fd408c64ed
17 changed files with 259 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java
View File

@ -19,11 +19,10 @@
package com.sk89q.worldedit.extent;
import com.boydti.fawe.beta.IBatchProcessor;
import com.boydti.fawe.object.HistoryExtent;
import com.boydti.fawe.object.changeset.FaweChangeSet;
import static com.google.common.base.Preconditions.checkNotNull;
import com.boydti.fawe.beta.IBatchProcessor;
import com.boydti.fawe.object.changeset.FaweChangeSet;
import com.boydti.fawe.object.clipboard.WorldCopyClipboard;
import com.boydti.fawe.object.exception.FaweException;
import com.sk89q.worldedit.MaxChangedBlocksException;
@ -142,9 +141,10 @@ public interface Extent extends InputExtent, OutputExtent {
/**
* Create an entity at the given location.
*
* @param entity the entity
* @param location the location
* @return a reference to the created entity, or null if the entity could not be created
* @param x the x coordinate
* @param y the y coordinate
* @param z the z coordinate
* @param uuid the unique identifier of the entity
*/
default @Nullable void removeEntity(int x, int y, int z, UUID uuid) {}

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

@ -104,18 +104,18 @@ public interface ClipboardFormat {
Set<String> getFileExtensions();
/**
* Set the player's clipboard
* @param player
* Set the actor's clipboard
* @param actor
* @param uri
* @param in
* @throws IOException
* @param inputStream the input stream
* @throws IOException thrown on I/O error
*/
default URIClipboardHolder hold(Actor actor, URI uri, InputStream in) throws IOException {
default URIClipboardHolder hold(Actor actor, URI uri, InputStream inputStream) throws IOException {
checkNotNull(actor);
checkNotNull(uri);
checkNotNull(in);
checkNotNull(inputStream);
final ClipboardReader reader = getReader(in);
final ClipboardReader reader = getReader(inputStream);
final Clipboard clipboard;