2 files changed, 4 insertions, 22 deletions

diff --git a/src/Entities/ArrowEntity.cpp b/src/Entities/ArrowEntity.cpp
index 47a0876fc..d59088e72 100644
--- a/src/Entities/ArrowEntity.cpp
+++ b/src/Entities/ArrowEntity.cpp
@@ -106,14 +106,7 @@ void cArrowEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
 	a_EntityHit.TakeDamage(dtRangedAttack, this, Damage, 1);
 	
 	// Broadcast successful hit sound
-	m_World->BroadcastSoundEffect(
-		"random.successful_hit",
-		(int)std::floor(GetPosX() * 8.0),
-		(int)std::floor(GetPosY() * 8.0),
-		(int)std::floor(GetPosZ() * 8.0),
-		0.5f,
-		0.75f + ((float)((GetUniqueID() * 23) % 32)) / 64.0f
-	);
+	GetWorld()->BroadcastSoundEffect("random.successful_hit", (int)GetPosX() * 8, (int)GetPosY() * 8, (int)GetPosZ() * 8, 0.5, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
 	
 	Destroy();
 }
@@ -136,21 +129,10 @@ void cArrowEntity::CollectedBy(cPlayer * a_Dest)
 				return;
 			}
 		}
-		
-		// TODO: BroadcastCollectPickup needs a cPickup, which we don't have
-		// m_World->BroadcastCollectPickup(*this, *a_Dest);
 
+		GetWorld()->BroadcastCollectEntity(*this, *a_Dest);
+		GetWorld()->BroadcastSoundEffect("random.pop", (int)GetPosX() * 8, (int)GetPosY() * 8, (int)GetPosZ() * 8, 0.5, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
 		m_bIsCollected = true;
-
-		cFastRandom Random;
-		m_World->BroadcastSoundEffect(
-			"random.pop",
-			(int)std::floor(GetPosX() * 8.0),
-			(int)std::floor(GetPosY() * 8),
-			(int)std::floor(GetPosZ() * 8),
-			0.2F,
-			((Random.NextFloat(1.0F) - Random.NextFloat(1.0F)) * 0.7F + 1.0F) * 2.0F
-		);
 	}
 }
 
diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp
index 10b6bbd5c..24fa591da 100644
--- a/src/Entities/Pickup.cpp
+++ b/src/Entities/Pickup.cpp
@@ -224,7 +224,7 @@ bool cPickup::CollectedBy(cPlayer * a_Dest)
 		}
 
 		m_Item.m_ItemCount -= NumAdded;
-		m_World->BroadcastCollectPickup(*this, *a_Dest);
+		m_World->BroadcastCollectEntity(*this, *a_Dest);
 		// Also send the "pop" sound effect with a somewhat random pitch (fast-random using EntityID ;)
 		m_World->BroadcastSoundEffect("random.pop",(int)GetPosX() * 8, (int)GetPosY() * 8, (int)GetPosZ() * 8, 0.5, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
 		if (m_Item.m_ItemCount <= 0)