From d86e06926242d49389c7042e8b02e0e8a3a54734 Mon Sep 17 00:00:00 2001
From: ulumulu1510 <b.heusser@gmx.ch>
Date: Mon, 10 Oct 2016 15:58:46 +0200
Subject: [PATCH] Remove entries properly and create objective on creative.

---
 src/com/massivecraft/massivecore/util/BoardUtil.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/massivecraft/massivecore/util/BoardUtil.java b/src/com/massivecraft/massivecore/util/BoardUtil.java
index 45071bbb..7cad280f 100644
--- a/src/com/massivecraft/massivecore/util/BoardUtil.java
+++ b/src/com/massivecraft/massivecore/util/BoardUtil.java
@@ -356,7 +356,7 @@ public class BoardUtil extends Engine
 	public static Objective getObjective(Scoreboard board, String id, boolean creative)
 	{
 		Objective objective = board.getObjective(id);
-		if (objective == null && creative) createObjective(board, id);
+		if (objective == null && creative) objective = createObjective(board, id);
 		return objective;
 	}
 	
@@ -520,10 +520,11 @@ public class BoardUtil extends Engine
 		}
 		
 		// Remove
-		for (String key : objective.getScoreboard().getEntries())
+		Scoreboard board = objective.getScoreboard();
+		for (String key : board.getEntries())
 		{
 			if (entries.containsKey(key)) continue;
-			ret |= setObjectiveValue(objective, key, 0);
+			board.resetScores(key);
 		}
 		
 		return ret;