Merge pull request #516 from frymaster/worldeditor-changes

Improvements to checks for inventory blocks and double inventory blocks

src/main/java/de/diddiz/LogBlock/WorldEditor.java

@@ -10,6 +10,7 @@ import org.bukkit.block.Sign;
 import org.bukkit.command.CommandSender;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.Material;
 import org.bukkit.material.Bed;
 import org.bukkit.material.PistonBaseMaterial;
 import org.bukkit.material.PistonExtensionMaterial;
@@ -26,6 +27,7 @@ import java.util.logging.Level;
 import static de.diddiz.LogBlock.config.Config.dontRollback;
 import static de.diddiz.LogBlock.config.Config.replaceAnyway;
 import static de.diddiz.util.BukkitUtils.equalTypes;
+import static de.diddiz.util.BukkitUtils.getContainerBlocks;
 import static de.diddiz.util.BukkitUtils.modifyContainer;
 import static de.diddiz.util.MaterialName.materialName;
 import static org.bukkit.Bukkit.getLogger;
@@ -162,21 +164,24 @@ public class WorldEditor implements Runnable
 				if (type == 0) {
 					if (!block.setTypeId(0))
 						throw new WorldEditorException(block.getTypeId(), 0, block.getLocation());
-				} else if (ca != null && (type == 23 || type == 54 || type == 61 || type == 62)) {
+				} else if (ca != null) {
-					int leftover;
+					if (getContainerBlocks().contains(Material.getMaterial(type))) {
-					try {
+						int leftover;
-						leftover = modifyContainer(state, new ItemStack(ca.itemType, -ca.itemAmount, ca.itemData));
+						try {
-						if (leftover > 0)
+							leftover = modifyContainer(state, new ItemStack(ca.itemType, -ca.itemAmount, ca.itemData));
-							for (final BlockFace face : new BlockFace[]{BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST})
+							// Special-case blocks which might be double chests
-								if (block.getRelative(face).getTypeId() == 54)
+							if (leftover > 0 && (type == 54 || type == 146))
-									leftover = modifyContainer(block.getRelative(face).getState(), new ItemStack(ca.itemType, ca.itemAmount < 0 ? leftover : -leftover, ca.itemData));
+								for (final BlockFace face : new BlockFace[]{BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST})
-					} catch (final Exception ex) {
+									if (block.getRelative(face).getTypeId() == type)
-						throw new WorldEditorException(ex.getMessage(), block.getLocation());
+										leftover = modifyContainer(block.getRelative(face).getState(), new ItemStack(ca.itemType, ca.itemAmount < 0 ? leftover : -leftover, ca.itemData));
+						} catch (final Exception ex) {
+							throw new WorldEditorException(ex.getMessage(), block.getLocation());
+						}
+						if (!state.update())
+							throw new WorldEditorException("Failed to update inventory of " + materialName(block.getTypeId()), block.getLocation());
+						if (leftover > 0 && ca.itemAmount < 0)
+							throw new WorldEditorException("Not enough space left in " + materialName(block.getTypeId()), block.getLocation());
 					}
-					if (!state.update())
-						throw new WorldEditorException("Failed to update inventory of " + materialName(block.getTypeId()), block.getLocation());
-					if (leftover > 0 && ca.itemAmount < 0)
-						throw new WorldEditorException("Not enough space left in " + materialName(block.getTypeId()), block.getLocation());
 				} else
 					return PerformResult.NO_ACTION;
 				return PerformResult.SUCCESS;

src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java

@@ -18,9 +18,11 @@ import org.bukkit.entity.WitherSkull;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.Material;
 
 import static de.diddiz.LogBlock.config.Config.getWorldConfig;
 import static de.diddiz.LogBlock.config.Config.logCreeperExplosionsAsPlayerWhoTriggeredThese;
+import static de.diddiz.util.BukkitUtils.getContainerBlocks;
 
 public class ExplosionLogging extends LoggingListener
 {
@@ -90,7 +92,7 @@ public class ExplosionLogging extends LoggingListener
 				final int type = block.getTypeId();
 				if (wcfg.isLogging(Logging.SIGNTEXT) & (type == 63 || type == 68))
 					consumer.queueSignBreak(name, (Sign)block.getState());
-				else if (wcfg.isLogging(Logging.CHESTACCESS) && (type == 23 || type == 54 || type == 61))
+				else if (wcfg.isLogging(Logging.CHESTACCESS) && (getContainerBlocks().contains(Material.getMaterial(type))))
 					consumer.queueContainerBreak(name, block.getState());
 				else
 					consumer.queueBlockBreak(name, block.getState());

src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java

@@ -60,12 +60,12 @@ public class ToolListener implements Listener
 					params.sel = null;
 					if (behavior == ToolBehavior.BLOCK)
 						params.setLocation(block.getRelative(event.getBlockFace()).getLocation());
-					else if (block.getTypeId() != 54 || tool.params.radius != 0)
+					else if ((block.getTypeId() != 54 && block.getTypeId() != 146) || tool.params.radius != 0)
 						params.setLocation(block.getLocation());
 					else {
 						if (logblock.getServer().getPluginManager().isPluginEnabled("WorldEdit")) {
 							for (final BlockFace face : new BlockFace[]{BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST}) {
-								if (block.getRelative(face).getTypeId() == 54) {
+								if (block.getRelative(face).getTypeId() == block.getTypeId()) {
 									params.setSelection(RegionContainer.fromCorners(event.getPlayer().getWorld(),
 											block.getLocation(), block.getRelative(face).getLocation()));
 								}

src/main/java/de/diddiz/util/BukkitUtils.java

@@ -153,6 +153,7 @@ public class BukkitUtils
 		containerBlocks.add(Material.HOPPER);
 		containerBlocks.add(Material.BREWING_STAND);
 		containerBlocks.add(Material.FURNACE);
+		containerBlocks.add(Material.BURNING_FURNACE);
 		containerBlocks.add(Material.BEACON);
 		// Doesn't actually have a block inventory
 		// containerBlocks.add(Material.ENDER_CHEST);