From 5786ba7a35e83bcfde462b5bb39f047a3736cecb Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Sat, 8 Jun 2013 14:30:26 +0200 Subject: [PATCH] Moved blocks around --- src/material/block/attachable/Torch.php | 2 +- src/material/block/{solid => nonfull}/Cake.php | 0 src/material/block/{solid => nonfull}/Cobweb.php | 0 src/material/block/{solid => nonfull}/Fence.php | 0 src/material/block/{solid => nonfull}/FenceGate.php | 0 src/material/block/{solid => nonfull}/GlassPane.php | 0 src/material/block/{solid => nonfull}/IronDoor.php | 0 src/material/block/{solid => nonfull}/Slab.php | 0 src/material/block/{solid => nonfull}/SnowLayer.php | 1 + src/material/block/{solid => nonfull}/WoodDoor.php | 0 src/material/block/{ => nonfull}/stairs/BrickStairs.php | 0 src/material/block/{ => nonfull}/stairs/CobblestoneStairs.php | 0 src/material/block/{ => nonfull}/stairs/NetherBricksStairs.php | 0 src/material/block/{ => nonfull}/stairs/QuartzStairs.php | 0 src/material/block/{ => nonfull}/stairs/SandstoneStairs.php | 0 src/material/block/{ => nonfull}/stairs/StoneBrickStairs.php | 0 src/material/block/{ => nonfull}/stairs/WoodStairs.php | 0 17 files changed, 2 insertions(+), 1 deletion(-) rename src/material/block/{solid => nonfull}/Cake.php (100%) rename src/material/block/{solid => nonfull}/Cobweb.php (100%) rename src/material/block/{solid => nonfull}/Fence.php (100%) rename src/material/block/{solid => nonfull}/FenceGate.php (100%) rename src/material/block/{solid => nonfull}/GlassPane.php (100%) rename src/material/block/{solid => nonfull}/IronDoor.php (100%) rename src/material/block/{solid => nonfull}/Slab.php (100%) rename src/material/block/{solid => nonfull}/SnowLayer.php (97%) rename src/material/block/{solid => nonfull}/WoodDoor.php (100%) rename src/material/block/{ => nonfull}/stairs/BrickStairs.php (100%) rename src/material/block/{ => nonfull}/stairs/CobblestoneStairs.php (100%) rename src/material/block/{ => nonfull}/stairs/NetherBricksStairs.php (100%) rename src/material/block/{ => nonfull}/stairs/QuartzStairs.php (100%) rename src/material/block/{ => nonfull}/stairs/SandstoneStairs.php (100%) rename src/material/block/{ => nonfull}/stairs/StoneBrickStairs.php (100%) rename src/material/block/{ => nonfull}/stairs/WoodStairs.php (100%) diff --git a/src/material/block/attachable/Torch.php b/src/material/block/attachable/Torch.php index bc1cf2ed..5176250b 100644 --- a/src/material/block/attachable/Torch.php +++ b/src/material/block/attachable/Torch.php @@ -44,7 +44,7 @@ class TorchBlock extends FlowableBlock{ ); if($this->getSide($faces[$side])->isTransparent === true and !($side === 0 and $this->getSide(0)->getID() === FENCE)){ //Replace wit common break method - ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id)); + ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id, 0, 1)); $this->level->setBlock($this, new AirBlock(), false); return BLOCK_UPDATE_NORMAL; } diff --git a/src/material/block/solid/Cake.php b/src/material/block/nonfull/Cake.php similarity index 100% rename from src/material/block/solid/Cake.php rename to src/material/block/nonfull/Cake.php diff --git a/src/material/block/solid/Cobweb.php b/src/material/block/nonfull/Cobweb.php similarity index 100% rename from src/material/block/solid/Cobweb.php rename to src/material/block/nonfull/Cobweb.php diff --git a/src/material/block/solid/Fence.php b/src/material/block/nonfull/Fence.php similarity index 100% rename from src/material/block/solid/Fence.php rename to src/material/block/nonfull/Fence.php diff --git a/src/material/block/solid/FenceGate.php b/src/material/block/nonfull/FenceGate.php similarity index 100% rename from src/material/block/solid/FenceGate.php rename to src/material/block/nonfull/FenceGate.php diff --git a/src/material/block/solid/GlassPane.php b/src/material/block/nonfull/GlassPane.php similarity index 100% rename from src/material/block/solid/GlassPane.php rename to src/material/block/nonfull/GlassPane.php diff --git a/src/material/block/solid/IronDoor.php b/src/material/block/nonfull/IronDoor.php similarity index 100% rename from src/material/block/solid/IronDoor.php rename to src/material/block/nonfull/IronDoor.php diff --git a/src/material/block/solid/Slab.php b/src/material/block/nonfull/Slab.php similarity index 100% rename from src/material/block/solid/Slab.php rename to src/material/block/nonfull/Slab.php diff --git a/src/material/block/solid/SnowLayer.php b/src/material/block/nonfull/SnowLayer.php similarity index 97% rename from src/material/block/solid/SnowLayer.php rename to src/material/block/nonfull/SnowLayer.php index b71b49cf..a5830d92 100644 --- a/src/material/block/solid/SnowLayer.php +++ b/src/material/block/nonfull/SnowLayer.php @@ -30,6 +30,7 @@ class SnowLayerBlock extends FlowableBlock{ parent::__construct(SNOW_LAYER, $meta, "Snow Layer"); $this->isReplaceable = true; $this->isSolid = false; + $this->isFullBlock = false; } public function onUpdate($type){ diff --git a/src/material/block/solid/WoodDoor.php b/src/material/block/nonfull/WoodDoor.php similarity index 100% rename from src/material/block/solid/WoodDoor.php rename to src/material/block/nonfull/WoodDoor.php diff --git a/src/material/block/stairs/BrickStairs.php b/src/material/block/nonfull/stairs/BrickStairs.php similarity index 100% rename from src/material/block/stairs/BrickStairs.php rename to src/material/block/nonfull/stairs/BrickStairs.php diff --git a/src/material/block/stairs/CobblestoneStairs.php b/src/material/block/nonfull/stairs/CobblestoneStairs.php similarity index 100% rename from src/material/block/stairs/CobblestoneStairs.php rename to src/material/block/nonfull/stairs/CobblestoneStairs.php diff --git a/src/material/block/stairs/NetherBricksStairs.php b/src/material/block/nonfull/stairs/NetherBricksStairs.php similarity index 100% rename from src/material/block/stairs/NetherBricksStairs.php rename to src/material/block/nonfull/stairs/NetherBricksStairs.php diff --git a/src/material/block/stairs/QuartzStairs.php b/src/material/block/nonfull/stairs/QuartzStairs.php similarity index 100% rename from src/material/block/stairs/QuartzStairs.php rename to src/material/block/nonfull/stairs/QuartzStairs.php diff --git a/src/material/block/stairs/SandstoneStairs.php b/src/material/block/nonfull/stairs/SandstoneStairs.php similarity index 100% rename from src/material/block/stairs/SandstoneStairs.php rename to src/material/block/nonfull/stairs/SandstoneStairs.php diff --git a/src/material/block/stairs/StoneBrickStairs.php b/src/material/block/nonfull/stairs/StoneBrickStairs.php similarity index 100% rename from src/material/block/stairs/StoneBrickStairs.php rename to src/material/block/nonfull/stairs/StoneBrickStairs.php diff --git a/src/material/block/stairs/WoodStairs.php b/src/material/block/nonfull/stairs/WoodStairs.php similarity index 100% rename from src/material/block/stairs/WoodStairs.php rename to src/material/block/nonfull/stairs/WoodStairs.php