mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 11:44:19 +01:00
9523f87f1c
Restores pre-1.13 behaviour. See linked ticket for further discussion. By: md_5 <git@md-5.net>
11 lines
624 B
Diff
11 lines
624 B
Diff
--- 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)) {
|