OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 04:02:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added getBlockReplacedState to BlockPlaceEvent, in case one wants to see what type of block was there previously.

Browse source
This commit is contained in:
VictorD 2011-01-24 23:22:28 +01:00
parent 0675ead169
commit 3477a86995
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/net/minecraft/server/ItemBlock.java
View file

@ -2,8 +2,9 @@ package net.minecraft.server;
// CraftBukkit start
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.block.BlockState;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.craftbukkit.block.CraftBlockState;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.Player;
import org.bukkit.event.Event.Type;
@ -59,9 +60,12 @@ public class ItemBlock extends Item {
return false;
}
// CraftBukkit start - store the old data so we can undo it
int oldMaterial = world.a(i, j, k);
int oldData = world.b(i, j, k);
// CraftBukkit start
/* We store the old data so we can undo it. Snow(78) and half-steps(44) are special in that they replace the block itself,
* rather than the block touching the face we clicked on.
*/
org.bukkit.block.Block replacedBlock = (blockClicked.getTypeId() == 78 || blockClicked.getTypeId() == 44) ? blockClicked:blockClicked.getFace(faceClicked);
final BlockState replacedBlockState = new CraftBlockState(replacedBlock);
if (world.a(a, i, j, k, false)) {
Block block = Block.m[a];
@ -88,7 +92,7 @@ public class ItemBlock extends Item {
// TODO make spawn size configurable
boolean canBuild = distanceFromSpawn > 16 || thePlayer.isOp();
BlockPlaceEvent bpe = new BlockPlaceEvent(eventType, placedBlock, blockClicked, itemInHand, thePlayer, canBuild);
BlockPlaceEvent bpe = new BlockPlaceEvent(eventType, placedBlock, replacedBlockState, blockClicked, itemInHand, thePlayer, canBuild);
server.getPluginManager().callEvent(bpe);
if (bpe.isCancelled() || !bpe.canBuild()) {
@ -102,7 +106,7 @@ public class ItemBlock extends Item {
world.b(i, j - 1, k, 44);
}
world.a(i, j, k, oldMaterial, oldData);
world.a(i, j, k, replacedBlockState.getTypeId(), replacedBlockState.getData().getData());
} else {
world.f(i, j, k, a); // <-- world.b does this on success (tell the world)

2
src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
View file

@ -184,7 +184,7 @@ public class CraftBlockState implements BlockState {
private void createData(final byte data) {
Material mat = Material.getMaterial(type);
if (mat == null) {
if (mat == null || mat.getData() == null) {
this.data = new MaterialData(type, data);
} else {
this.data = mat.getNewData(data);