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

Current Progress #3

Browse Source
This commit is contained in:
IronApollo
2019-01-09 02:13:44 -05:00
parent d4157b7e0e
commit 842b1307c7
221 changed files with 3173 additions and 3041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worldedit-core/src/main/java/com/sk89q/worldedit/event/extent/EditSessionEvent.java
View File

@ -20,13 +20,9 @@
package com.sk89q.worldedit.event.extent;
import com.sk89q.worldedit.EditSession;
<<<<<<< HEAD
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.event.Cancellable;
=======
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
import com.sk89q.worldedit.event.Event;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extent.Extent;
@ -59,11 +55,7 @@ import static com.sk89q.worldedit.EditSession.Stage;
* is set to {@link Stage#BEFORE_HISTORY}, then you can drop (or log) changes
* before the change has reached the history, reordering, and actual change
* extents, <em>but</em> that means that any changes made with
<<<<<<< HEAD
* {@link EditSession#rawSetBlock(Vector, BaseBlock)} will skip your
=======
* {@link EditSession#rawSetBlock(BlockVector3, BlockStateHolder)} will skip your
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
* custom {@link Extent} because that method bypasses history (and reorder).
* It is thus recommended that loggers intercept at {@link Stage#BEFORE_CHANGE}
* and block interceptors intercept at BOTH {@link Stage#BEFORE_CHANGE} and

9
worldedit-core/src/main/java/com/sk89q/worldedit/event/extent/PasteEvent.java
View File

@ -19,12 +19,13 @@
package com.sk89q.worldedit.event.extent;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.event.Cancellable;
import com.sk89q.worldedit.event.Event;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.math.BlockVector3;
import java.net.URI;
@ -35,11 +36,11 @@ public class PasteEvent extends Event implements Cancellable {
private final Player player;
private final Clipboard clipboard;
private final URI uri;
private final Vector to;
private final BlockVector3 to;
private final Extent extent;
private boolean cancelled;
public PasteEvent(Player player, Clipboard clipboard, URI uri, Extent extent, Vector to) {
public PasteEvent(Player player, Clipboard clipboard, URI uri, Extent extent, BlockVector3 to) {
this.player = player;
this.clipboard = clipboard;
this.uri = uri;
@ -59,7 +60,7 @@ public class PasteEvent extends Event implements Cancellable {
return uri;
}
public Vector getPosition() {
public BlockVector3 getPosition() {
return to;
}