Paper/paper-server/nms-patches/net/minecraft/server/commands/CommandTrigger.patch

12 lines
624 B
Diff
Raw Normal View History

--- 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)) {