Parker Hawke / CraftBukkit / e5f8a7672ea

Commits

md_5 authored e5f8a7672ea 01 Feb 2022

SPIGOT-6917: Use main scoreboard for /trigger

Restores pre-1.13 behaviour. See linked ticket for further discussion.

Added

-+
+--- a/net/minecraft/server/commands/CommandTrigger.java
-+
++++ b/net/minecraft/server/commands/CommandTrigger.java
-+
+@@ -90,7 +90,7 @@
-+
+         if (scoreboardobjective.getCriteria() != IScoreboardCriteria.TRIGGER) {
-+
+             throw CommandTrigger.ERROR_INVALID_OBJECTIVE.create();
-+
+         } else {
-+
+-            Scoreboard scoreboard = entityplayer.getScoreboard();
-+
++            Scoreboard scoreboard = entityplayer.getServer().getScoreboard(); // CraftBukkit - SPIGOT-6917: use main scoreboard
-+
+             String s = entityplayer.getScoreboardName();
-+
-+
+             if (!scoreboard.hasPlayerScore(s, scoreboardobjective)) {