Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-08-23 04:53:42 +02:00
Code Issues Projects Releases Wiki Activity

Fixed BlockPlace event. Fixes BUKKIT-663

Browse Source
This commit is contained in:
Tahg 2012-01-30 02:19:22 -05:00 committed by EvilSeph
parent 875219e28c
commit 69e766c5f3
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/minecraft/server/BlockRedstoneWire.java
View File

@ -196,6 +196,7 @@ public class BlockRedstoneWire extends Block {
}
public void onPlace(World world, int i, int j, int k) {
if (world.suppressPhysics) return; // CraftBukkit
super.onPlace(world, i, j, k);
if (!world.isStatic) {
this.g(world, i, j, k);

4
src/main/java/net/minecraft/server/ItemBlock.java
View File

@ -77,7 +77,11 @@ public class ItemBlock extends Item {
eventUseBlockBelow = itemstack.id == Block.STEP.id && blockStateBelow.getTypeId() == Block.STEP.id;
}
world.suppressPhysics = true;
world.setTypeIdAndData(i, j, k, this.id, this.filterData(itemstack.getData()));
BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, eventUseBlockBelow ? blockStateBelow : replacedBlockState, clickedX, clickedY, clickedZ, block);
replacedBlockState.update(true);
world.suppressPhysics = false;
if (event.isCancelled() || !event.canBuild()) {
return true;

11
src/main/java/net/minecraft/server/ItemRedstone.java
View File

@ -49,18 +49,21 @@ public class ItemRedstone extends Item {
return false;
} else {
if (Block.REDSTONE_WIRE.canPlace(world, i, j, k)) {
CraftBlockState blockState = CraftBlockState.getBlockState(world, i, j, k); // CraftBukkit
// CraftBukkit start
CraftBlockState blockState = CraftBlockState.getBlockState(world, i, j, k);
world.setRawTypeId(i, j, k, Block.REDSTONE_WIRE.id); // CraftBukkit - We update after the event
world.suppressPhysics = true;
world.setRawTypeId(i, j, k, Block.REDSTONE_WIRE.id); // We update after the event
// CraftBukkit start - redstone
BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, blockState, clickedX, clickedY, clickedZ, Block.REDSTONE_WIRE);
blockState.update(true);
if (event.isCancelled() || !event.canBuild()) {
event.getBlockPlaced().setTypeIdAndData(blockState.getTypeId(), blockState.getRawData(), false);
return false;
}
world.suppressPhysics = false;
world.setTypeId(i, j, k, Block.REDSTONE_WIRE.id);
world.update(i, j, k, Block.REDSTONE_WIRE.id); // Must take place after BlockPlaceEvent, we need to update all other blocks.
// CraftBukkit end