Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle beds and doors the same way as other blocks. Fixes BUKKIT-3437

Browse Source 
Relates to: BUKKIT-3438
This commit is contained in:
feildmaster
2013-01-16 08:03:35 -06:00
parent 614ef2f8c5
commit 98aea835b5
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/net/minecraft/server/ItemDoor.java
View File

@@ -1,7 +1,5 @@
package net.minecraft.server;
import org.bukkit.craftbukkit.block.CraftBlockState; // CraftBukkit
public class ItemDoor extends Item {
private Material a;
@@ -85,17 +83,22 @@ public class ItemDoor extends Item {
flag2 = true;
}
CraftBlockState blockState = CraftBlockState.getBlockState(world, i, j, k); // CraftBukkit
world.suppressPhysics = true;
world.setTypeIdAndData(i, j, k, block.id, l);
// CraftBukkit start
if (entityhuman != null) {
org.bukkit.event.block.BlockPlaceEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(world, entityhuman, blockState, i, j, k);
if (event.isCancelled() || !event.canBuild()) {
event.getBlockPlaced().setTypeIdAndData(blockState.getTypeId(), blockState.getRawData(), false);
if(!ItemBlock.processBlockPlace(world, entityhuman, null, i, j, k, block.id, l)) {
((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet53BlockChange(i, j + 1, k, world));
return false;
}
if (world.getTypeId(i, j, k) != block.id) {
((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet53BlockChange(i, j + 1, k, world));
return true;
}
world.suppressPhysics = true;
} else {
world.setTypeIdAndData(i, j, k, block.id, l);
}
// CraftBukkit end
world.setTypeIdAndData(i, j + 1, k, block.id, 8 | (flag2 ? 1 : 0));