diff --git a/pom.xml b/pom.xml index 722a0dc..d8b0bf4 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ org.spigotmc spigot-api - 1.13.1-R0.1-SNAPSHOT + 1.13.2-R0.1-SNAPSHOT provided diff --git a/src/main/java/de/diddiz/worldedit/CuboidRegion.java b/src/main/java/de/diddiz/worldedit/CuboidRegion.java index 8bb0209..9fe937c 100644 --- a/src/main/java/de/diddiz/worldedit/CuboidRegion.java +++ b/src/main/java/de/diddiz/worldedit/CuboidRegion.java @@ -4,6 +4,7 @@ import com.sk89q.worldedit.IncompleteRegionException; import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.WorldEditPlugin; +import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.Region; import org.bukkit.Location; @@ -11,7 +12,6 @@ import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.util.BlockVector; -import org.bukkit.util.Vector; public class CuboidRegion implements Cloneable { @@ -19,7 +19,7 @@ public class CuboidRegion implements Cloneable { private BlockVector min = new BlockVector(); private BlockVector max = new BlockVector(); - public CuboidRegion(World world, Vector first, Vector second) { + public CuboidRegion(World world, BlockVector3 first, BlockVector3 second) { this.world = world; this.min.setX(Math.min(first.getBlockX(),second.getBlockX())); this.min.setY(Math.min(first.getBlockY(),second.getBlockY())); @@ -48,15 +48,13 @@ public class CuboidRegion implements Cloneable { if (!(selection instanceof com.sk89q.worldedit.regions.CuboidRegion)) { throw new IllegalArgumentException("You have to define a cuboid selection"); } - com.sk89q.worldedit.Vector weMin = selection.getMinimumPoint(); - com.sk89q.worldedit.Vector weMax = selection.getMaximumPoint(); - Vector min = new Vector(weMin.getBlockX(), weMin.getBlockY(), weMin.getBlockZ()); - Vector max = new Vector(weMax.getBlockX(), weMax.getBlockY(), weMax.getBlockZ()); + BlockVector3 min = selection.getMinimumPoint(); + BlockVector3 max = selection.getMaximumPoint(); return new CuboidRegion(world, min, max); } public static CuboidRegion fromCorners(World world, Location first, Location second) { - return new CuboidRegion(world, first.toVector(), second.toVector()); + return new CuboidRegion(world, BukkitAdapter.asBlockVector(first), BukkitAdapter.asBlockVector(second)); } public World getWorld() { diff --git a/src/main/java/de/diddiz/worldedit/WorldEditLoggingHook.java b/src/main/java/de/diddiz/worldedit/WorldEditLoggingHook.java index 783c9dd..28b3d6e 100644 --- a/src/main/java/de/diddiz/worldedit/WorldEditLoggingHook.java +++ b/src/main/java/de/diddiz/worldedit/WorldEditLoggingHook.java @@ -1,7 +1,6 @@ package de.diddiz.worldedit; import com.sk89q.worldedit.EditSession; -import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.bukkit.BukkitAdapter; @@ -9,6 +8,7 @@ import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.event.extent.EditSessionEvent; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extent.AbstractDelegateExtent; +import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.eventbus.Subscribe; import com.sk89q.worldedit.world.block.BlockStateHolder; @@ -87,12 +87,12 @@ public class WorldEditLoggingHook { event.setExtent(new AbstractDelegateExtent(event.getExtent()) { @Override - public final boolean setBlock(Vector position, @SuppressWarnings("rawtypes") BlockStateHolder block) throws WorldEditException { + public final boolean setBlock(BlockVector3 position, @SuppressWarnings("rawtypes") BlockStateHolder block) throws WorldEditException { onBlockChange(position, block); return super.setBlock(position, block); } - protected void onBlockChange(Vector pt, BlockStateHolder block) { + protected void onBlockChange(BlockVector3 pt, BlockStateHolder block) { if (event.getStage() != EditSession.Stage.BEFORE_CHANGE) { return;