summaryrefslogtreecommitdiffstats
path: root/source/Blocks
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-26 16:39:04 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-26 16:39:04 +0200
commit5c3235ecdc3f718ce20e006f1ecfa2159df82c87 (patch)
treeaea2e4a722715498c59b0a828486b30b74506bb5 /source/Blocks
parentItemGrid: Added the RemoveOneItem() function (diff)
downloadcuberite-5c3235ecdc3f718ce20e006f1ecfa2159df82c87.tar
cuberite-5c3235ecdc3f718ce20e006f1ecfa2159df82c87.tar.gz
cuberite-5c3235ecdc3f718ce20e006f1ecfa2159df82c87.tar.bz2
cuberite-5c3235ecdc3f718ce20e006f1ecfa2159df82c87.tar.lz
cuberite-5c3235ecdc3f718ce20e006f1ecfa2159df82c87.tar.xz
cuberite-5c3235ecdc3f718ce20e006f1ecfa2159df82c87.tar.zst
cuberite-5c3235ecdc3f718ce20e006f1ecfa2159df82c87.zip
Diffstat (limited to 'source/Blocks')
-rw-r--r--source/Blocks/BlockDropSpenser.h (renamed from source/Blocks/BlockDispenser.h)13
-rw-r--r--source/Blocks/BlockHandler.cpp5
2 files changed, 9 insertions, 9 deletions
diff --git a/source/Blocks/BlockDispenser.h b/source/Blocks/BlockDropSpenser.h
index e5cde2fc5..bcc75758d 100644
--- a/source/Blocks/BlockDispenser.h
+++ b/source/Blocks/BlockDropSpenser.h
@@ -1,20 +1,19 @@
-#pragma once
+// BlockDropSpenser.h
+
+// Declares the cBlockDropSpenserHandler class representing the BlockHandler for Dropper and Dispenser blocks
-#include "BlockEntity.h"
-#include "../World.h"
-#include "../Piston.h"
-#include "../Player.h"
+#pragma once
-class cBlockDispenserHandler :
+class cBlockDropSpenserHandler :
public cBlockEntityHandler
{
public:
- cBlockDispenserHandler(BLOCKTYPE a_BlockType) :
+ cBlockDropSpenserHandler(BLOCKTYPE a_BlockType) :
cBlockEntityHandler(a_BlockType)
{
}
diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp
index 816c6f7e6..149dcd98d 100644
--- a/source/Blocks/BlockHandler.cpp
+++ b/source/Blocks/BlockHandler.cpp
@@ -28,7 +28,7 @@
#include "BlockFluid.h"
#include "BlockChest.h"
#include "BlockFurnace.h"
-#include "BlockDispenser.h"
+#include "BlockDropSpenser.h"
#include "BlockStairs.h"
#include "BlockLadder.h"
#include "BlockLever.h"
@@ -110,9 +110,10 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
case E_BLOCK_CROPS: return new cBlockCropsHandler (a_BlockType);
case E_BLOCK_DIAMOND_ORE: return new cBlockOreHandler (a_BlockType);
case E_BLOCK_DIRT: return new cBlockDirtHandler (a_BlockType);
- case E_BLOCK_DISPENSER: return new cBlockDispenserHandler (a_BlockType);
+ case E_BLOCK_DISPENSER: return new cBlockDropSpenserHandler (a_BlockType);
case E_BLOCK_DOUBLE_STONE_SLAB: return new cBlockSlabHandler (a_BlockType);
case E_BLOCK_DOUBLE_WOODEN_SLAB: return new cBlockSlabHandler (a_BlockType);
+ case E_BLOCK_DROPPER: return new cBlockDropSpenserHandler (a_BlockType);
case E_BLOCK_EMERALD_ORE: return new cBlockOreHandler (a_BlockType);
case E_BLOCK_ENDER_CHEST: return new cBlockEnderchestHandler (a_BlockType);
case E_BLOCK_FARMLAND: return new cBlockFarmlandHandler;