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

8
source/Blocks/BlockHandler.cpp
View File

@@ -354,6 +354,14 @@ void cBlockHandler::DropBlock(cWorld * a_World, cEntity * a_Digger, int a_BlockX
if (!Pickups.empty())
{
// Add random offset to the spawn position:
// Commented out until bug with pickups not spawning properly is fixed, see World.cpp
/*
int MicroX = (int)(a_BlockX * 32) + (r1.randInt(16) + r1.randInt(16) - 16);
int MicroY = (int)(a_BlockY * 32) + (r1.randInt(16) + r1.randInt(16) - 16);
int MicroZ = (int)(a_BlockZ * 32) + (r1.randInt(16) + r1.randInt(16) - 16);
*/
a_World->SpawnItemPickups(Pickups, a_BlockX, a_BlockY, a_BlockZ);
}
}