Fix door physics and revert to pre 1.0 behavior
Dieser Commit ist enthalten in:
Ursprung
483a619e8a
Commit
b74a69041e
@ -142,8 +142,7 @@ public class BlockDoor extends Block {
|
||||
if (world.getTypeId(i, j - 1, k) != this.id) {
|
||||
world.setTypeId(i, j, k, 0);
|
||||
}
|
||||
|
||||
if (l > 0 && l != this.id) {
|
||||
else if (l > 0 && l != this.id) { // CraftBukkit
|
||||
this.doPhysics(world, i, j - 1, k, l);
|
||||
}
|
||||
} else {
|
||||
@ -166,8 +165,8 @@ public class BlockDoor extends Block {
|
||||
if (!world.isStatic) {
|
||||
this.b(world, i, j, k, i1, 0);
|
||||
}
|
||||
} else if (l > 0 && l != this.id) {
|
||||
// CraftBukkit start
|
||||
// CraftBukkit start
|
||||
} else if (l > 0 && Block.byId[l].isPowerSource()) {
|
||||
org.bukkit.World bworld = world.getWorld();
|
||||
org.bukkit.block.Block block = bworld.getBlockAt(i, j, k);
|
||||
org.bukkit.block.Block blockTop = bworld.getBlockAt(i, j + 1, k);
|
||||
|
@ -50,12 +50,12 @@ public class ItemDoor extends Item {
|
||||
}
|
||||
|
||||
public static void a(World world, int i, int j, int k, int l, Block block) {
|
||||
// CraftBukkit Start
|
||||
// CraftBukkit start
|
||||
a(world, i, j, k, l, block, null);
|
||||
}
|
||||
|
||||
public static boolean a(World world, int i, int j, int k, int l, Block block, EntityHuman entityhuman) {
|
||||
int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit
|
||||
// CraftBukkit end
|
||||
byte b0 = 0;
|
||||
byte b1 = 0;
|
||||
|
||||
@ -93,30 +93,22 @@ public class ItemDoor extends Item {
|
||||
}
|
||||
|
||||
CraftBlockState blockState = CraftBlockState.getBlockState(world, i, j, k); // CraftBukkit
|
||||
|
||||
world.suppressPhysics = true;
|
||||
world.setTypeIdAndData(i, j, k, block.id, l);
|
||||
world.suppressPhysics = false;
|
||||
|
||||
world.applyPhysics(i, j, k, block.id);
|
||||
|
||||
// CraftBukkit start
|
||||
if (entityhuman != null) {
|
||||
BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, blockState, clickedX, clickedY, clickedZ, block);
|
||||
BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, blockState, i, j, k, block);
|
||||
|
||||
if (event.isCancelled() || !event.canBuild()) {
|
||||
event.getBlockPlaced().setTypeIdAndData(blockState.getTypeId(), blockState.getRawData(), false);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
world.suppressPhysics = true;
|
||||
//CraftBukkit end
|
||||
world.setTypeIdAndData(i, j + 1, k, block.id, l + 8);
|
||||
world.suppressPhysics = false;
|
||||
|
||||
// world.applyPhysics(i, j, k, block.id); // CraftBukkit - moved up
|
||||
world.applyPhysics(i, j, k, block.id);
|
||||
world.applyPhysics(i, j + 1, k, block.id);
|
||||
|
||||
return true;
|
||||
// CraftBukkit end
|
||||
return true; // CraftBukkit
|
||||
}
|
||||
}
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren