Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-03 18:07:26 +02:00
Code Issues Projects Releases Wiki Activity

Fix falling blocks setting id

Browse Source
This commit is contained in:
fullwall 2014-01-08 17:42:37 +08:00
parent 8ad3b1d674
commit 6cc922a115
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/citizensnpcs/npc/entity/nonliving/FallingBlockController.java
View File

@ -32,8 +32,10 @@ public class FallingBlockController extends AbstractEntityController {
@Override
protected Entity createEntity(Location at, NPC npc) {
WorldServer ws = ((CraftWorld) at.getWorld()).getHandle();
final EntityFallingBlockNPC handle = new EntityFallingBlockNPC(ws, npc, at.getX(), at.getY(), at.getZ(),
Blocks.STONE);
Block id = Blocks.STONE;
if (npc.data().has("falling-block-id"))
id = CraftMagicNumbers.getBlock(Material.getMaterial(npc.data().<String> get("falling-block-id")));
final EntityFallingBlockNPC handle = new EntityFallingBlockNPC(ws, npc, at.getX(), at.getY(), at.getZ(), id);
return handle.getBukkitEntity();
}
@ -128,8 +130,7 @@ public class FallingBlockController extends AbstractEntityController {
}
public void setType(Material material) {
EntityFallingBlock e = (EntityFallingBlock) entity;
e.id = CraftMagicNumbers.getBlock(material);
npc.data().setPersistent("falling-block-id", material.name());
if (npc.isSpawned()) {
npc.despawn();
npc.spawn(npc.getStoredLocation());