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

Bundled fixes [SEE DESC]

Browse Source 
* BoundingBox now returns FACE_NONE
+ Arrows can be picked up
* Arrows dug up resume physics simulations
* Added sound effects for bows, lava to stone, and arrows
* Fixed SoundParticleEffect on <1.7 protocols
This commit is contained in:
Tiger Wang
2013-11-12 21:43:20 +00:00
parent f713780db3
commit 347162a82f
9 changed files with 147 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/Chunk.cpp
View File

@@ -1679,9 +1679,9 @@ void cChunk::CollectPickupsByPlayer(cPlayer * a_Player)
for (cEntityList::iterator itr = m_Entities.begin(); itr != m_Entities.end(); ++itr)
{
if (!(*itr)->IsPickup())
if ((!(*itr)->IsPickup()) && (!(*itr)->IsProjectile()))
{
continue; // Only pickups
continue; // Only pickups and projectiles
}
float DiffX = (float)((*itr)->GetPosX() - PosX );
float DiffY = (float)((*itr)->GetPosY() - PosY );
@@ -1695,7 +1695,14 @@ void cChunk::CollectPickupsByPlayer(cPlayer * a_Player)
);
*/
MarkDirty();
(reinterpret_cast<cPickup *>(*itr))->CollectedBy( a_Player );
if ((*itr)->IsPickup())
{
(reinterpret_cast<cPickup *>(*itr))->CollectedBy(a_Player);
}
else
{
(reinterpret_cast<cProjectileEntity *>(*itr))->CollectedBy(a_Player);
}
}
else if (SqrDist < 5 * 5)
{