Merging upstream changes

This commit is contained in:
matt
2019-03-26 13:27:09 -04:00
parent 85bfd16d7c
commit 0d88a6bce2
23 changed files with 1708 additions and 1768 deletions

View File

@ -19,6 +19,8 @@
package com.sk89q.worldedit.session;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
@ -27,9 +29,6 @@ import com.sk89q.worldedit.math.transform.Transform;
import java.util.Collections;
import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Holds the clipboard and the current transform on the clipboard.
*/
@ -47,8 +46,6 @@ public class ClipboardHolder {
this.clipboard = clipboard;
}
protected ClipboardHolder() {}
/**
* Get the clipboard.
* <p>