Fix scoreboard not using the correct display mode in some circumstances

Fixes SpongePowered#1711
ImMorpheus · Jan 14, 2018 · 3537712 · 3537712
1 parent ece0579
commit 3537712
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScoreboardLogic.java b/src/main/java/org/spongepowered/common/mixin/core/scoreboard/MixinScoreboardLogic.java
@@ -36,6 +36,7 @@
 import org.spongepowered.api.scoreboard.critieria.Criterion;
 import org.spongepowered.api.scoreboard.displayslot.DisplaySlot;
 import org.spongepowered.api.scoreboard.objective.Objective;
+import org.spongepowered.api.scoreboard.objective.displaymode.ObjectiveDisplayMode;
 import org.spongepowered.api.text.Text;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
@@ -86,6 +87,7 @@ public abstract class MixinScoreboardLogic extends Scoreboard implements IMixinS
     @Override
     public ScoreObjective addScoreObjective(String name, IScoreCriteria criteria) {
         SpongeObjective objective = new SpongeObjective(name, (Criterion) criteria);
+        objective.setDisplayMode((ObjectiveDisplayMode) (Object) criteria.getRenderType());
         this.scoreboard$addObjective(objective);
         return objective.getObjectiveFor(this);
     }

diff --git a/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeObjectiveBuilder.java b/src/main/java/org/spongepowered/common/scoreboard/builder/SpongeObjectiveBuilder.java
@@ -28,6 +28,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
+import net.minecraft.scoreboard.IScoreCriteria;
 import org.spongepowered.api.scoreboard.critieria.Criterion;
 import org.spongepowered.api.scoreboard.objective.Objective;
 import org.spongepowered.api.scoreboard.objective.displaymode.ObjectiveDisplayMode;
@@ -105,6 +106,8 @@ public Objective build() throws IllegalStateException {
 
         if (this.objectiveDisplayMode != null) {
             objective.setDisplayMode(this.objectiveDisplayMode);
+        } else if (this.criterion instanceof IScoreCriteria) {
+            objective.setDisplayMode((ObjectiveDisplayMode) (Object) ((IScoreCriteria) this.criterion).getRenderType());
         }
 
         return objective;