diff options
| author | Mattes D <github@xoft.cz> | 2014-03-02 22:03:44 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-03-02 22:03:44 +0100 |
| commit | d25e4d4179c00f1692c4d348baece49561c49938 (patch) | |
| tree | c180208ae9759403cc29c4784103569793e6cc63 /src/Scoreboard.cpp | |
| parent | Fixed MSVC warnings in DeprecatedBindings. (diff) | |
| parent | Removed if condition (diff) | |
| download | cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar.gz cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar.bz2 cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar.lz cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar.xz cuberite-d25e4d4179c00f1692c4d348baece49561c49938.tar.zst cuberite-d25e4d4179c00f1692c4d348baece49561c49938.zip | |
Diffstat (limited to 'src/Scoreboard.cpp')
| -rw-r--r-- | src/Scoreboard.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/Scoreboard.cpp b/src/Scoreboard.cpp index 05fd0314d..c1da27086 100644 --- a/src/Scoreboard.cpp +++ b/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; } |