diff options
| author | Tahg <tahgtahv@gmail.com> | 2011-02-21 19:43:12 -0500 |
|---|---|---|
| committer | Tahg <tahgtahv@gmail.com> | 2011-02-21 19:57:23 -0500 |
| commit | 96435cfc76e129f278febe8c478a8cf6cc48e875 (patch) | |
| tree | 54ee3a739a8f3be703b9af6478a4a72dbbd36691 /src/main/java/net/minecraft/server | |
| parent | f659231e347f0e06a24f94d72136d3dfd9f0c7c4 (diff) | |
| download | craftbukkit-96435cfc76e129f278febe8c478a8cf6cc48e875.tar craftbukkit-96435cfc76e129f278febe8c478a8cf6cc48e875.tar.gz craftbukkit-96435cfc76e129f278febe8c478a8cf6cc48e875.tar.lz craftbukkit-96435cfc76e129f278febe8c478a8cf6cc48e875.tar.xz craftbukkit-96435cfc76e129f278febe8c478a8cf6cc48e875.zip | |
refactor Items
Diffstat (limited to 'src/main/java/net/minecraft/server')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 4 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/ItemBlock.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/NetServerHandler.java | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 66bae6e1..c4815735 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -4,8 +4,8 @@ import java.util.List; // CraftBukkit start import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.entity.CraftItem; import org.bukkit.craftbukkit.TrigMath; -import org.bukkit.craftbukkit.entity.CraftItemDrop; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; @@ -223,7 +223,7 @@ public abstract class EntityHuman extends EntityLiving { // CraftBukkit start Player player = (Player)this.getBukkitEntity(); CraftServer server = ((WorldServer)world).getServer(); - CraftItemDrop drop = new CraftItemDrop(server, entityitem); + CraftItem drop = new CraftItem(server, entityitem); PlayerDropItemEvent event = new PlayerDropItemEvent(player, drop); server.getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java index a400cae5..7c182e90 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -116,7 +116,7 @@ public class ItemBlock extends Item { world.setTypeId(i, j, k, 20); } - world.setTypeIdAndData(i, j, k, replacedBlockState.getTypeId(), replacedBlockState.getData().getData()); + world.setTypeIdAndData(i, j, k, replacedBlockState.getTypeId(), replacedBlockState.getRawData()); } } else { diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index a38b768d..ec8cabb4 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -330,8 +330,8 @@ public class NetServerHandler extends NetHandler implements ICommandListener { // if we are destroying either a redstone wire with a current greater than 0 or // a redstone torch that is on, then we should notify plugins that this block has // returned to a current value of 0 (since it will once the redstone is destroyed) - if ((blockId == Block.REDSTONE_WIRE.id && block.getData() > 0) || blockId == Block.REDSTONE_TORCH_ON.id) { - server.getPluginManager().callEvent( new BlockRedstoneEvent(block, (blockId == Block.REDSTONE_WIRE.id ? block.getData() : 15), 0)); + if ((blockId == Block.REDSTONE_WIRE.id && block.getRawData() > 0) || blockId == Block.REDSTONE_TORCH_ON.id) { + server.getPluginManager().callEvent( new BlockRedstoneEvent(block, (blockId == Block.REDSTONE_WIRE.id ? block.getRawData() : 15), 0)); } event = new BlockDamageEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.BROKEN, player); } else { @@ -364,8 +364,8 @@ public class NetServerHandler extends NetHandler implements ICommandListener { // if we are destroying either a redstone wire with a current greater than 0 or // a redstone torch that is on, then we should notify plugins that this block has // returned to a current value of 0 (since it will once the redstone is destroyed) - if ((blockId == Block.REDSTONE_WIRE.id && block.getData() > 0) || blockId == Block.REDSTONE_TORCH_ON.id) { - server.getPluginManager().callEvent( new BlockRedstoneEvent(block, (blockId == Block.REDSTONE_WIRE.id ? block.getData() : 15), 0)); + if ((blockId == Block.REDSTONE_WIRE.id && block.getRawData() > 0) || blockId == Block.REDSTONE_TORCH_ON.id) { + server.getPluginManager().callEvent( new BlockRedstoneEvent(block, (blockId == Block.REDSTONE_WIRE.id ? block.getRawData() : 15), 0)); } event = new BlockDamageEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.BROKEN, player); } else { |