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

Merge branch 'pickups' of git://github.com/tigerw/MCServer into tigerw-pickups

Browse Source 
Conflicts:
	source/BlockID.cpp
	source/Entities/Entity.cpp
This commit is contained in:
madmaxoft
2013-09-15 20:49:08 +02:00
parent 4e200df18c 11bbfbc98a
commit 5cde7d8a29
12 changed files with 134 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/BlockID.cpp
View File

@@ -778,10 +778,11 @@ public:
g_BlockIsSolid[E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE] = false;
g_BlockIsSolid[E_BLOCK_MELON_STEM] = false;
g_BlockIsSolid[E_BLOCK_NETHER_PORTAL] = false;
g_BlockIsSolid[E_BLOCK_PISTON_MOVED_BLOCK] = false;
g_BlockIsSolid[E_BLOCK_POTATOES] = false;
g_BlockIsSolid[E_BLOCK_PUMPKIN_STEM] = false;
g_BlockIsSolid[E_BLOCK_PISTON] = false;
g_BlockIsSolid[E_BLOCK_PISTON_EXTENSION] = false;
g_BlockIsSolid[E_BLOCK_RAIL] = false;
g_BlockIsSolid[E_BLOCK_REDSTONE_REPEATER_OFF] = false;
g_BlockIsSolid[E_BLOCK_REDSTONE_REPEATER_ON] = false;
g_BlockIsSolid[E_BLOCK_REDSTONE_TORCH_OFF] = false;
g_BlockIsSolid[E_BLOCK_REDSTONE_TORCH_ON] = false;
g_BlockIsSolid[E_BLOCK_REDSTONE_WIRE] = false;