Skip to content

Version 1.6.1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bermudalocket merged 1 commit into from
Nov 9, 2018
Merged

Version 1.6.1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>net.sothatsit</groupId>
<artifactId>blockstore</artifactId>
<version>1.6.0</version>
<version>1.6.1</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -54,4 +54,4 @@
</dependency>
</dependencies>

</project>
</project>
9 changes: 5 additions & 4 deletions src/main/java/net/sothatsit/blockstore/WorldEditHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -17,7 +18,7 @@ public class WorldEditHook {
void register() {
WorldEdit.getInstance().getEventBus().register(this);
}

@Subscribe
public void wrapForLogging(EditSessionEvent event) {
World world = event.getWorld();
Expand All @@ -28,13 +29,13 @@ 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);
return getExtent().setBlock(pos, block);
}
});
}

}