diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-10-07 15:02:51 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-10-07 15:02:51 +0200 |
| commit | e3a69a527d53fd7540dce4a424d280a9d0cbb1a9 (patch) | |
| tree | 33f4dd2e2e39bd62f441f836f2e85c9ee978391f | |
| parent | Merge pull request #1513 from mc-server/MojangAPIRefresh (diff) | |
| download | cuberite-e3a69a527d53fd7540dce4a424d280a9d0cbb1a9.tar cuberite-e3a69a527d53fd7540dce4a424d280a9d0cbb1a9.tar.gz cuberite-e3a69a527d53fd7540dce4a424d280a9d0cbb1a9.tar.bz2 cuberite-e3a69a527d53fd7540dce4a424d280a9d0cbb1a9.tar.lz cuberite-e3a69a527d53fd7540dce4a424d280a9d0cbb1a9.tar.xz cuberite-e3a69a527d53fd7540dce4a424d280a9d0cbb1a9.tar.zst cuberite-e3a69a527d53fd7540dce4a424d280a9d0cbb1a9.zip | |
| -rw-r--r-- | src/Blocks/BlockHandler.cpp | 3 | ||||
| -rw-r--r-- | src/Blocks/BlockHayBale.h | 22 |
2 files changed, 1 insertions, 24 deletions
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp index ff0b201e7..904e0a921 100644 --- a/src/Blocks/BlockHandler.cpp +++ b/src/Blocks/BlockHandler.cpp @@ -36,7 +36,6 @@ #include "BlockGlass.h" #include "BlockGlowstone.h" #include "BlockGravel.h" -#include "BlockHayBale.h" #include "BlockMobHead.h" #include "BlockHopper.h" #include "BlockIce.h" @@ -231,7 +230,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType) case E_BLOCK_GLASS_PANE: return new cBlockGlassHandler (a_BlockType); case E_BLOCK_GRASS: return new cBlockDirtHandler (a_BlockType); case E_BLOCK_GRAVEL: return new cBlockGravelHandler (a_BlockType); - case E_BLOCK_HAY_BALE: return new cBlockHayBaleHandler (a_BlockType); + case E_BLOCK_HAY_BALE: return new cBlockSidewaysHandler (a_BlockType); case E_BLOCK_HEAD: return new cBlockMobHeadHandler (a_BlockType); case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE: return new cBlockPressurePlateHandler(a_BlockType); case E_BLOCK_HOPPER: return new cBlockHopperHandler (a_BlockType); diff --git a/src/Blocks/BlockHayBale.h b/src/Blocks/BlockHayBale.h deleted file mode 100644 index 8150b10d3..000000000 --- a/src/Blocks/BlockHayBale.h +++ /dev/null @@ -1,22 +0,0 @@ - -#pragma once - -#include "BlockSideways.h" - - - - - -class cBlockHayBaleHandler : - public cBlockSidewaysHandler -{ -public: - cBlockHayBaleHandler(BLOCKTYPE a_BlockType) - : cBlockSidewaysHandler(a_BlockType) - { - } -} ; - - - - |