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

Move the tile entity with the falling block. Adds BUKKIT-3349

Browse Source 
Allows for interesting things to be done with world.spawn()
This commit is contained in:
feildmaster 2013-01-01 23:17:38 -06:00
parent 8f0c1aed6b
commit fb0be1fc0a
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ public class EntityFallingBlock extends Entity {
private boolean hurtEntities;
private int fallHurtMax;
private float fallHurtAmount;
private NBTTagCompound tileEntityData; // CraftBukkit
public EntityFallingBlock(World world) {
super(world);
@ -90,6 +91,17 @@ public class EntityFallingBlock extends Entity {
return;
}
// CraftBukkit start - Store the block tile entity with this entity
TileEntity tile = this.world.getTileEntity(i, j, k);
if (tile != null) {
tileEntityData = new NBTTagCompound();
// Save the data
tile.b(tileEntityData);
// Remove the existing tile entity
this.world.r(i, j, k);
}
// CraftBukkit end
this.world.setTypeId(i, j, k, 0);
}
@ -105,6 +117,10 @@ public class EntityFallingBlock extends Entity {
return;
}
this.world.setTypeIdAndData(i, j, k, this.id, this.data);
if (this.tileEntityData != null) {
this.world.setTileEntity(i, j, k, TileEntity.c(this.tileEntityData));
}
// CraftBukkit end
if (Block.byId[this.id] instanceof BlockSand) {
((BlockSand) Block.byId[this.id]).a_(this.world, i, j, k, this.data);
@ -171,6 +187,11 @@ public class EntityFallingBlock extends Entity {
nbttagcompound.setBoolean("HurtEntities", this.hurtEntities);
nbttagcompound.setFloat("FallHurtAmount", this.fallHurtAmount);
nbttagcompound.setInt("FallHurtMax", this.fallHurtMax);
// CraftBukkit start - store the tile data
if (this.tileEntityData != null) {
nbttagcompound.set("Bukkit.tileData", this.tileEntityData.clone());
}
// CraftBukkit end
}
protected void a(NBTTagCompound nbttagcompound) {
@ -185,6 +206,12 @@ public class EntityFallingBlock extends Entity {
this.hurtEntities = true;
}
// CraftBukkit start - load tileData
if (nbttagcompound.hasKey("Bukkit.tileData")) {
this.tileEntityData = (NBTTagCompound) nbttagcompound.getCompound("Bukkit.tileData").clone();
}
// CraftBukkit end
if (nbttagcompound.hasKey("DropItem")) {
this.dropItem = nbttagcompound.getBoolean("DropItem");
}