Merge remote-tracking branch 'refs/remotes/sk89q/master'

# Conflicts:

#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java

worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java

@@ -39,18 +39,13 @@ import java.util.Objects;
 import javax.annotation.Nullable;
 
 /**
- * Represents a mutable "snapshot" of a block.
+ * Represents a "snapshot" of a block with NBT Data.
  *
  * <p>An instance of this block contains all the information needed to
  * accurately reproduce the block, provided that the instance was
  * made correctly. In some implementations, it may not be possible to get a
  * snapshot of blocks correctly, so, for example, the NBT data for a block
  * may be missing.</p>
- *
- * <p>A peculiar detail of this class is that it accepts {@code -1} as a
- * valid data value. This is due to legacy reasons: WorldEdit uses -1
- * as a "wildcard" block value, even though a {@link Mask} would be
- * more appropriate.</p>
  */
 public class BaseBlock extends BlockState {
     private BlockState blockState;

worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockMaterial.java

@@ -163,4 +163,10 @@ public interface BlockMaterial {
      * @return If it has a container
      */
     boolean hasContainer();
+
+    /**
+     * Get the map color
+     * @return or 0
+     */
+    int getMapColor();
 }