flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Revert "Converted some blockhandlers to use cClearMetaOnDrop"

Browse Source 
This reverts commit 333f4f982c.
This commit is contained in:
Tycho 2014-07-14 23:59:24 +01:00
parent 2cd3443fbb
commit 8fd636aa72
9 changed files with 67 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Blocks/BlockBrewingStand.h
View File

@ -2,21 +2,25 @@
#pragma once
#include "BlockHandler.h"
#include "ClearMetaOnDrop.h"
class cBlockBrewingStandHandler :
public cClearMetaOnDrop<cBlockHandler>
public cBlockHandler
{
public:
cBlockBrewingStandHandler(BLOCKTYPE a_BlockType)
: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
: cBlockHandler(a_BlockType)
{
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_ITEM_BREWING_STAND, 1, 0));
}
virtual bool IsUseable() override
{
return true;

10
src/Blocks/BlockCobWeb.h
View File

@ -10,13 +10,19 @@
class cBlockCobWebHandler :
public cClearMetaOnDrop<cBlockHandler>
public cBlockHandler
{
public:
cBlockCobWebHandler(BLOCKTYPE a_BlockType)
: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
: cBlockHandler(a_BlockType)
{
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_Meta) override
{
a_Pickups.push_back(cItem(E_ITEM_STRING, 1, 0));
}
} ;

9
src/Blocks/BlockFlowerPot.h
View File

@ -9,13 +9,18 @@
class cBlockFlowerPotHandler :
public cClearMetaOnDrop<cBlockEntityHandler>
public cBlockEntityHandler
{
public:
cBlockFlowerPotHandler(BLOCKTYPE a_BlockType) :
cClearMetaOnDrop<cBlockEntityHandler>(a_BlockType)
cBlockEntityHandler(a_BlockType)
{
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_ITEM_FLOWER_POT, 1, 0));
}
} ;

9
src/Blocks/BlockLilypad.h
View File

@ -8,14 +8,19 @@
class cBlockLilypadHandler :
public cClearMetaOnDrop<cBlockHandler>
public cBlockHandler
{
public:
cBlockLilypadHandler(BLOCKTYPE a_BlockType)
: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
: cBlockHandler(a_BlockType)
{
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
// Reset meta to zero
a_Pickups.push_back(cItem(E_BLOCK_LILY_PAD, 1, 0));
}
};

8
src/Blocks/BlockMycelium.h
View File

@ -8,16 +8,20 @@
class cBlockMyceliumHandler :
public cClearMetaOnDrop<cBlockHandler>
public cBlockHandler
{
public:
cBlockMyceliumHandler(BLOCKTYPE a_BlockType)
: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
: cBlockHandler(a_BlockType)
{
}
// TODO: Add Mycel Spread
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_BLOCK_DIRT, 1, 0));
}
virtual const char * GetStepSound(void) override
{

11
src/Blocks/BlockRedstone.h
View File

@ -9,11 +9,11 @@
class cBlockRedstoneHandler :
public cClearMetaOnDrop<cBlockHandler>
public cBlockHandler
{
public:
cBlockRedstoneHandler(BLOCKTYPE a_BlockType)
: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
: cBlockHandler(a_BlockType)
{
}
@ -22,6 +22,13 @@ public:
{
return ((a_RelY > 0) && cBlockInfo::FullyOccupiesVoxel(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ)));
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
// Reset meta to 0
a_Pickups.push_back(cItem(E_ITEM_REDSTONE_DUST, 1));
}
} ;

9
src/Blocks/BlockRedstoneLamp.h
View File

@ -8,13 +8,18 @@
class cBlockRedstoneLampHandler :
public cClearMetaOnDrop<cBlockHandler>
public cBlockHandler
{
public:
cBlockRedstoneLampHandler(BLOCKTYPE a_BlockType)
: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
: cBlockHandler(a_BlockType)
{
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_BLOCK_REDSTONE_LAMP_OFF, 1, 0));
}
};

13
src/Blocks/BlockRedstoneRepeater.h
View File

@ -4,16 +4,16 @@
#include "BlockHandler.h"
#include "Chunk.h"
#include "MetaRotator.h"
#include "ClearMetaOnDrop.h"
class cBlockRedstoneRepeaterHandler :
public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true> >
public cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>
{
public:
cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockType)
: cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true> >(a_BlockType)
: cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>(a_BlockType)
{
}
@ -44,6 +44,13 @@ public:
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
// Reset meta to 0
a_Pickups.push_back(cItem(E_ITEM_REDSTONE_REPEATER, 1, 0));
}
virtual bool IsUseable(void) override
{
return true;

9
src/Blocks/BlockStone.h
View File

@ -2,21 +2,24 @@
#pragma once
#include "BlockHandler.h"
#include "ClearMetaOnDrop.h"
class cBlockStoneHandler :
public cClearMetaOnDrop<cBlockHandler>
public cBlockHandler
{
public:
cBlockStoneHandler(BLOCKTYPE a_BlockType)
: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
: cBlockHandler(a_BlockType)
{
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_BLOCK_COBBLESTONE, 1, 0));
}
} ;