Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-08 01:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed block bags not being flushed in super pickaxe modes.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/sk89q/worldedit/superpickaxe/BlockReplacer.java
View File

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

8
src/com/sk89q/worldedit/superpickaxe/SphereBrush.java
View File

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