cBlockInfo now manages the respective cBlockHandler

src/Scoreboard.cpp

@@ -312,12 +312,18 @@ bool cScoreboard::RemoveObjective(const AString & a_Name)
 		return false;
 	}
 
-	m_Objectives.erase(it);
-
 	ASSERT(m_World != NULL);
 	m_World->BroadcastScoreboardObjective(it->second.GetName(), it->second.GetDisplayName(), 1);
 
-	// TODO 2014-03-01 xdot: Remove objective from display slot
+	for (unsigned int i = 0; i < (unsigned int) dsCount; ++i)
+	{
+		if (m_Display[i] == &it->second)
+		{
+			SetDisplay(NULL, (eDisplaySlot) i);
+		}
+	}
+
+	m_Objectives.erase(it);
 
 	return true;
 }