Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 11:38:29 +01:00
Code Issues Projects Releases Wiki Activity

Made steps fire a BlockPlace event. Fixes BUKKIT-394

Browse Source
This commit is contained in:
Tahg 2012-02-08 21:26:49 -05:00 committed by EvilSeph
parent 6abd178ea7
commit 10ab7b96ed
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,29 +58,18 @@ public class ItemBlock extends Item {
return false; return false;
} else if (j == world.height - 1 && Block.byId[this.id].material.isBuildable()) { } else if (j == world.height - 1 && Block.byId[this.id].material.isBuildable()) {
return false; return false;
} else if (world.mayPlace(this.id, i, j, k, false, l)) { }
Block block = Block.byId[this.id]; // CraftBukkit start
int id = (l == -1 && itemstack.getItem() instanceof ItemStep) ? Block.DOUBLE_STEP.id : this.id;
if (id != this.id || world.mayPlace(this.id, i, j, k, false, l)) {
Block block = Block.byId[id];
// CraftBukkit start - This executes the placement of the block
CraftBlockState replacedBlockState = CraftBlockState.getBlockState(world, i, j, k); CraftBlockState replacedBlockState = CraftBlockState.getBlockState(world, i, j, k);
// There are like 30 combinations you can mix and match steps and double steps
// of different materials, so there are a lot of different cases of what
// would happen if you place x step onto another y step, so let's just keep
// track of the entire state
CraftBlockState blockStateBelow = null;
// Toggles whether the normal or the block below is used for the place event
boolean eventUseBlockBelow = false;
if ((world.getTypeId(i, j - 1, k) == Block.STEP.id || world.getTypeId(i, j - 1, k) == Block.DOUBLE_STEP.id) && (itemstack.id == Block.DOUBLE_STEP.id || itemstack.id == Block.STEP.id)) {
blockStateBelow = CraftBlockState.getBlockState(world, i, j - 1, k);
// Step is placed on step, forms a doublestep replacing the original step, so we need the lower block
eventUseBlockBelow = itemstack.id == Block.STEP.id && blockStateBelow.getTypeId() == Block.STEP.id;
}
world.suppressPhysics = true; world.suppressPhysics = true;
world.setTypeIdAndData(i, j, k, this.id, this.filterData(itemstack.getData())); world.setTypeIdAndData(i, j, k, id, this.filterData(itemstack.getData()));
BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, eventUseBlockBelow ? blockStateBelow : replacedBlockState, clickedX, clickedY, clickedZ, block); BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, replacedBlockState, clickedX, clickedY, clickedZ, block);
int id = world.getTypeId(i, j, k); id = world.getTypeId(i, j, k);
int data = world.getData(i, j, k); int data = world.getData(i, j, k);
replacedBlockState.update(true); replacedBlockState.update(true);
world.suppressPhysics = false; world.suppressPhysics = false;

7
src/main/java/net/minecraft/server/ItemStep.java
View File

@ -36,12 +36,15 @@ public class ItemStep extends ItemBlock {
int j1 = world.getData(i, j, k); int j1 = world.getData(i, j, k);
if (l == 1 && i1 == Block.STEP.id && j1 == itemstack.getData()) { if (l == 1 && i1 == Block.STEP.id && j1 == itemstack.getData()) {
// CraftBukkit start - handle this in super
/*
if (world.setTypeIdAndData(i, j, k, Block.DOUBLE_STEP.id, j1)) { if (world.setTypeIdAndData(i, j, k, Block.DOUBLE_STEP.id, j1)) {
world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), Block.DOUBLE_STEP.stepSound.getName(), (Block.DOUBLE_STEP.stepSound.getVolume1() + 1.0F) / 2.0F, Block.DOUBLE_STEP.stepSound.getVolume2() * 0.8F); world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), Block.DOUBLE_STEP.stepSound.getName(), (Block.DOUBLE_STEP.stepSound.getVolume1() + 1.0F) / 2.0F, Block.DOUBLE_STEP.stepSound.getVolume2() * 0.8F);
--itemstack.count; --itemstack.count;
} }
*/
return true; return super.a(itemstack, entityhuman, world, i, j, k, -1);
// CraftBukkit end
} else { } else {
return super.a(itemstack, entityhuman, world, i, j, k, l); return super.a(itemstack, entityhuman, world, i, j, k, l);
} }