From 504a6af6e824e81858c5265893538f93403a558f Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Fri, 29 Mar 2013 22:26:27 -0500 Subject: [PATCH] Add Beacon block state for hopper events. Fixes BUKKIT-3932 By: Travis Watkins --- .../bukkit/craftbukkit/block/CraftBeacon.java | 37 +++++++++++++++++++ .../bukkit/craftbukkit/block/CraftBlock.java | 2 + 2 files changed, 39 insertions(+) create mode 100644 paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java new file mode 100644 index 000000000..c39857eca --- /dev/null +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java @@ -0,0 +1,37 @@ +package org.bukkit.craftbukkit.block; + +import net.minecraft.server.TileEntityBeacon; + +import org.bukkit.block.Block; +import org.bukkit.block.Beacon; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.inventory.CraftInventory; +import org.bukkit.inventory.Inventory; + +public class CraftBeacon extends CraftBlockState implements Beacon { + private final CraftWorld world; + private final TileEntityBeacon beacon; + + public CraftBeacon(final Block block) { + super(block); + + world = (CraftWorld) block.getWorld(); + beacon = (TileEntityBeacon) world.getTileEntityAt(getX(), getY(), getZ()); + } + + public Inventory getInventory() { + return new CraftInventory(beacon); + } + + @Override + public boolean update(boolean force) { + boolean result = super.update(force); + + if (result) { + beacon.update(); + } + + return result; + } +} + diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index 2334fb625..9afe6aef4 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -265,6 +265,8 @@ public class CraftBlock implements Block { return new CraftSkull(this); case COMMAND: return new CraftCommandBlock(this); + case BEACON: + return new CraftBeacon(this); default: return new CraftBlockState(this); }