Removed ReplacingEditSession, which is now obsoleted by the changes to EditSession.

src/main/java/com/sk89q/worldedit/ReplacingEditSession.java

@@ -1,86 +0,0 @@
-// $Id$
-/*
- * WorldEdit
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldedit;
-
-import com.sk89q.worldedit.bags.BlockBag;
-import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.masks.Mask;
-
-/**
- * An edit session that will only replace blocks as specified.
- * 
- * @author sk89q
- */
-public class ReplacingEditSession extends EditSession {
-    /**
-     * Filter to use to filter blocks.
-     */
-    private Mask mask;
-    
-    /**
-     * Construct the object.
-     * 
-     * @param world
-     * @param maxBlocks
-     * @param mask 
-     */
-    public ReplacingEditSession(LocalWorld world,
-            int maxBlocks, Mask mask) {
-        super(world, maxBlocks);
-        this.mask = mask;
-    }
-
-    /**
-     * Construct the object.
-     * 
-     * @param world
-     * @param maxBlocks
-     * @param blockBag
-     * @param mask 
-     */
-    public ReplacingEditSession(LocalWorld world, int maxBlocks,
-            BlockBag blockBag, Mask mask) {
-        super(world, maxBlocks, blockBag);
-        this.mask = mask;
-    }
-    
-    /**
-     * Sets a block without changing history.
-     * 
-     * @param pt
-     * @param block
-     * @return Whether the block changed
-     */
-    @Override
-    public boolean rawSetBlock(Vector pt, BaseBlock block) {        
-        int y = pt.getBlockY();
-        
-        if (y < 0 || y > 127) {
-            return false;
-        }
-        
-        if (!mask.matches(this, pt)) {
-            return false;
-        }
-        
-        return super.rawSetBlock(pt, block);
-    }
-
-}

src/main/java/com/sk89q/worldedit/tools/BrushTool.java

@@ -23,6 +23,7 @@ import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.bags.BlockBag;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.masks.CombinedMask;
 import com.sk89q.worldedit.masks.Mask;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.patterns.SingleBlockPattern;
@@ -154,14 +155,16 @@ public class BrushTool implements TraceTool {
         
         BlockBag bag = session.getBlockBag(player);
         
-        EditSession editSession;
+        EditSession editSession = session.createEditSession(player);
-        
+        Mask existingMask = editSession.getMask();
-        if (mask == null) {
+        if (existingMask == null) {
-            editSession = new EditSession(target.getWorld(),
+            editSession.setMask(mask);
-                    session.getBlockChangeLimit(), bag);
+        } else if (existingMask instanceof CombinedMask) {
+            ((CombinedMask) existingMask).add(mask);
         } else {
-            editSession = new ReplacingEditSession(target.getWorld(),
+            CombinedMask newMask = new CombinedMask(existingMask);
-                    session.getBlockChangeLimit(), bag, mask);
+            newMask.add(mask);
+            editSession.setMask(newMask);
         }
         
         try {