feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Adapt to latest WorldEdit changes + Compile against Spigot 1.13.2

Browse Source
This commit is contained in:
Brokkonaut
2018-11-06 01:56:25 +01:00
parent 35e62e03e9
commit f2dc3daad0
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -42,7 +42,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.13.1-R0.1-SNAPSHOT</version> <version>1.13.2-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

12
src/main/java/de/diddiz/worldedit/CuboidRegion.java
View File

@ -4,6 +4,7 @@ import com.sk89q.worldedit.IncompleteRegionException;
import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import org.bukkit.Location; import org.bukkit.Location;
@ -11,7 +12,6 @@ import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.util.BlockVector; import org.bukkit.util.BlockVector;
import org.bukkit.util.Vector;
public class CuboidRegion implements Cloneable { public class CuboidRegion implements Cloneable {
@ -19,7 +19,7 @@ public class CuboidRegion implements Cloneable {
private BlockVector min = new BlockVector(); private BlockVector min = new BlockVector();
private BlockVector max = 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.world = world;
this.min.setX(Math.min(first.getBlockX(),second.getBlockX())); this.min.setX(Math.min(first.getBlockX(),second.getBlockX()));
this.min.setY(Math.min(first.getBlockY(),second.getBlockY())); 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)) { if (!(selection instanceof com.sk89q.worldedit.regions.CuboidRegion)) {
throw new IllegalArgumentException("You have to define a cuboid selection"); throw new IllegalArgumentException("You have to define a cuboid selection");
} }
com.sk89q.worldedit.Vector weMin = selection.getMinimumPoint(); BlockVector3 min = selection.getMinimumPoint();
com.sk89q.worldedit.Vector weMax = selection.getMaximumPoint(); BlockVector3 max = selection.getMaximumPoint();
Vector min = new Vector(weMin.getBlockX(), weMin.getBlockY(), weMin.getBlockZ());
Vector max = new Vector(weMax.getBlockX(), weMax.getBlockY(), weMax.getBlockZ());
return new CuboidRegion(world, min, max); return new CuboidRegion(world, min, max);
} }
public static CuboidRegion fromCorners(World world, Location first, Location second) { 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() { public World getWorld() {

6
src/main/java/de/diddiz/worldedit/WorldEditLoggingHook.java
View File

@ -1,7 +1,6 @@
package de.diddiz.worldedit; package de.diddiz.worldedit;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.bukkit.BukkitAdapter; 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.event.extent.EditSessionEvent;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.util.eventbus.Subscribe; import com.sk89q.worldedit.util.eventbus.Subscribe;
import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockStateHolder;
@ -87,12 +87,12 @@ public class WorldEditLoggingHook {
event.setExtent(new AbstractDelegateExtent(event.getExtent()) { event.setExtent(new AbstractDelegateExtent(event.getExtent()) {
@Override @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); onBlockChange(position, block);
return super.setBlock(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) { if (event.getStage() != EditSession.Stage.BEFORE_CHANGE) {
return; return;