Fixed block bags not being flushed in super pickaxe modes.

This commit is contained in:
sk89q 2011-01-17 21:26:18 -08:00
parent 6adab71160
commit 3e8b2edff9
2 changed files with 11 additions and 4 deletions

View File

@ -20,6 +20,7 @@
package com.sk89q.worldedit.superpickaxe;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.bags.BlockBag;
import com.sk89q.worldedit.blocks.BaseBlock;
/**
@ -37,15 +38,17 @@ public class BlockReplacer implements SuperPickaxeMode {
@Override
public boolean act(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, WorldVector clicked) {
BlockBag bag = session.getBlockBag(player);
LocalWorld world = clicked.getWorld();
EditSession editSession = new EditSession(server, world, -1,
session.getBlockBag(player));
EditSession editSession = new EditSession(server, world, -1, bag);
try {
editSession.setBlock(clicked, targetBlock);
} catch (MaxChangedBlocksException e) {
} finally {
bag.flushChanges();
session.remember(editSession);
}

View File

@ -20,6 +20,7 @@
package com.sk89q.worldedit.superpickaxe;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.bags.BlockBag;
import com.sk89q.worldedit.blocks.BaseBlock;
/**
@ -47,9 +48,11 @@ public class SphereBrush implements SuperPickaxeMode {
player.printError("No block in sight!");
return true;
}
BlockBag bag = session.getBlockBag(player);
ReplacingEditSession editSession = new ReplacingEditSession(server, target.getWorld(),
session.getBlockChangeLimit(), session.getBlockBag(player));
session.getBlockChangeLimit(), bag);
if (nonReplacing) {
editSession.disableReplacing();
@ -60,6 +63,7 @@ public class SphereBrush implements SuperPickaxeMode {
} catch (MaxChangedBlocksException e) {
player.printError("Max blocks change limit reached.");
} finally {
bag.flushChanges();
editSession.enableReplacing();
session.remember(editSession);
}