From 37e41604925d1ef63aa28baab3ef52e7902362fb Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Fri, 21 Sep 2012 20:03:50 +0500 Subject: [PATCH] Properly save the data on block place. Fixes #190 --- src/main/java/de/diddiz/LogBlock/Consumer.java | 2 +- .../de/diddiz/LogBlock/listeners/BlockPlaceLogging.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/de/diddiz/LogBlock/Consumer.java b/src/main/java/de/diddiz/LogBlock/Consumer.java index 2d67263..03a9a34 100644 --- a/src/main/java/de/diddiz/LogBlock/Consumer.java +++ b/src/main/java/de/diddiz/LogBlock/Consumer.java @@ -85,7 +85,7 @@ public class Consumer extends TimerTask * Blockstate of the block after actually being placed. */ public void queueBlockPlace(String playerName, BlockState after) { - queueBlockPlace(playerName, new Location(after.getWorld(), after.getX(), after.getY(), after.getZ()), after.getTypeId(), after.getRawData()); + queueBlockPlace(playerName, new Location(after.getWorld(), after.getX(), after.getY(), after.getZ()), after.getBlock().getTypeId(), after.getBlock().getData()); } /** diff --git a/src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java index bc9e53b..e4bbbb9 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java @@ -8,7 +8,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.player.PlayerBucketEmptyEvent; -import org.bukkit.material.MaterialData; import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.config.WorldConfig; @@ -27,13 +26,6 @@ public class BlockPlaceLogging extends LoggingListener final BlockState before = event.getBlockReplacedState(); final BlockState after = event.getBlockPlaced().getState(); final String playerName = event.getPlayer().getName(); - if (type == 0 && event.getItemInHand() != null) { - if (event.getItemInHand().getTypeId() == 51) - return; - after.setTypeId(event.getItemInHand().getTypeId()); - after.setData(new MaterialData(event.getItemInHand().getTypeId())); - } - if (wcfg.isLogging(Logging.SIGNTEXT) && (type == 63 || type == 68)) return; //Delay queuing by one tick to allow data to be updated