feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Merge pull request #237 from ammaraskar/redo_positions

Browse Source 
Properly save the data on block place. Fixes #190
This commit is contained in:
md-5
2012-09-21 16:22:11 -07:00
parent 2671e015a8 37e4160492
commit 72a810e515
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/diddiz/LogBlock/Consumer.java
View File

@@ -85,7 +85,7 @@ public class Consumer extends TimerTask
* Blockstate of the block after actually being placed. * Blockstate of the block after actually being placed.
*/ */
public void queueBlockPlace(String playerName, BlockState after) { 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());
} }
/** /**

8
src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java
View File

@@ -8,7 +8,6 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerBucketEmptyEvent; import org.bukkit.event.player.PlayerBucketEmptyEvent;
import org.bukkit.material.MaterialData;
import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.LogBlock;
import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.Logging;
import de.diddiz.LogBlock.config.WorldConfig; import de.diddiz.LogBlock.config.WorldConfig;
@@ -27,13 +26,6 @@ public class BlockPlaceLogging extends LoggingListener
final BlockState before = event.getBlockReplacedState(); final BlockState before = event.getBlockReplacedState();
final BlockState after = event.getBlockPlaced().getState(); final BlockState after = event.getBlockPlaced().getState();
final String playerName = event.getPlayer().getName(); 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)) if (wcfg.isLogging(Logging.SIGNTEXT) && (type == 63 || type == 68))
return; return;
//Delay queuing by one tick to allow data to be updated //Delay queuing by one tick to allow data to be updated