SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität

Refactor processBlockPlace logic. Fixes BUKKIT-3406 and BUKKIT-3454

Quellcode durchsuchen 
The previous logic was faulty since it lost the logic of "placing" the
block. It was also taking into account data that could have been
changed outside of the processing of this event, which is irrelevant
to the processing of this event.
Dieser Commit ist enthalten in:
feildmaster 2013-01-18 23:07:28 -06:00
Ursprung 6a499c8589
Commit 9ba0ddc292
4 geänderte Dateien mit 14 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

1
src/main/java/net/minecraft/server/BlockPumpkin.java
Datei anzeigen

@ -40,7 +40,6 @@ public class BlockPumpkin extends BlockDirectional {
public void onPlace(World world, int i, int j, int k) {
super.onPlace(world, i, j, k);
if (world.suppressPhysics) return; // CraftBukkit
if (world.getTypeId(i, j - 1, k) == Block.SNOW_BLOCK.id && world.getTypeId(i, j - 2, k) == Block.SNOW_BLOCK.id) {
if (!world.isStatic) {
// CraftBukkit start - use BlockStateListPopulator

1
src/main/java/net/minecraft/server/BlockRedstoneWire.java
Datei anzeigen

@ -196,7 +196,6 @@ 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.l(world, i, j, k);

4
src/main/java/net/minecraft/server/Chunk.java
Datei anzeigen

@ -429,8 +429,8 @@ public class Chunk {
if (l != 0) {
if (!this.world.isStatic) {
// CraftBukkit start - Don't extend piston until data is set
if (!(Block.byId[l] instanceof BlockPiston) || i2 != 0) {
// CraftBukkit start - Don't extend piston until data is set, don't "place" if we're processing the event
if (!this.world.suppressPhysics && (!(Block.byId[l] instanceof BlockPiston) || i2 != 0)) {
Block.byId[l].onPlace(this.world, j2, j, k2);
}
// CraftBukkit end

16
src/main/java/net/minecraft/server/ItemBlock.java
Datei anzeigen

@ -80,7 +80,7 @@ public class ItemBlock extends Item {
org.bukkit.block.BlockState blockstate = org.bukkit.craftbukkit.block.CraftBlockState.getBlockState(world, x, y, z);
world.suppressPhysics = true;
world.setTypeIdAndData(x, y, z, id, data);
world.setRawTypeIdAndData(x, y, z, id, data);
org.bukkit.event.block.BlockPlaceEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(world, entityhuman, blockstate, x, y, z);
if (event.isCancelled() || !event.canBuild()) {
@ -90,12 +90,20 @@ public class ItemBlock extends Item {
}
world.suppressPhysics = false;
world.applyPhysics(x, y, z, world.getTypeId(x, y, z));
Block block = Block.byId[world.getTypeId(x, y, z)];
int newId = world.getTypeId(x, y, z);
int newData = world.getData(x, y, z);
Block block = Block.byId[newId];
if (block != null) {
block.onPlace(world, x, y, z);
}
world.update(x, y, z, newId);
if (block != null) {
block.postPlace(world, x, y, z, entityhuman);
block.postPlace(world, x, y, z, world.getData(x, y, z));
block.postPlace(world, x, y, z, newData);
world.makeSound((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.getPlaceSound(), (block.stepSound.getVolume1() + 1.0F) / 2.0F, block.stepSound.getVolume2() * 0.8F);
}