From a6ac19ef6f41e3db0a23bffdcea4d6f6ddfa8fed Mon Sep 17 00:00:00 2001 From: totemo Date: Wed, 7 Nov 2018 13:38:55 +1030 Subject: [PATCH] Version 1.6.1 Fix build for recent Vector-related API changes in WorldEdit. (https://github.com/sk89q/WorldEdit/commit/399e0ad5fa7637d5d3ccce7ead1ad409e85c7dd2) --- pom.xml | 4 ++-- .../java/net/sothatsit/blockstore/WorldEditHook.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 21b2477..8804a03 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.sothatsit blockstore - 1.6.0 + 1.6.1 jar @@ -54,4 +54,4 @@ - \ No newline at end of file + diff --git a/src/main/java/net/sothatsit/blockstore/WorldEditHook.java b/src/main/java/net/sothatsit/blockstore/WorldEditHook.java index 8a53f8f..2f14170 100755 --- a/src/main/java/net/sothatsit/blockstore/WorldEditHook.java +++ b/src/main/java/net/sothatsit/blockstore/WorldEditHook.java @@ -1,13 +1,14 @@ package net.sothatsit.blockstore; -import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.event.extent.EditSessionEvent; import com.sk89q.worldedit.extent.AbstractDelegateExtent; +import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.util.eventbus.Subscribe; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockStateHolder; + import net.sothatsit.blockstore.chunkstore.BlockLoc; import net.sothatsit.blockstore.chunkstore.ChunkManager; import net.sothatsit.blockstore.chunkstore.ChunkStore; @@ -17,7 +18,7 @@ public class WorldEditHook { void register() { WorldEdit.getInstance().getEventBus().register(this); } - + @Subscribe public void wrapForLogging(EditSessionEvent event) { World world = event.getWorld(); @@ -28,7 +29,7 @@ public void wrapForLogging(EditSessionEvent event) { final ChunkManager manager = BlockStore.getInstance().getManager(world.getName()); event.setExtent(new AbstractDelegateExtent(event.getExtent()) { @Override - public boolean setBlock(Vector pos, BlockStateHolder block) throws WorldEditException { + public boolean setBlock(BlockVector3 pos, BlockStateHolder block) throws WorldEditException { BlockLoc blockLoc = BlockLoc.fromLocation(pos.getX(), pos.getY(), pos.getZ()); ChunkStore store = manager.getChunkStore(blockLoc.chunkLoc, true); store.setPlaced(blockLoc, false); @@ -36,5 +37,5 @@ public boolean setBlock(Vector pos, BlockStateHolder block) throws WorldEditExce } }); } - + } \ No newline at end of file