From 76976e4797b96416a3b84df4e0cd4b7c39175865 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 4 Apr 2013 23:35:16 -0500 Subject: [PATCH] Make auxiliary worlds use the main scoreboard. Addresses BUKKIT-3984 When a world is created using our API, it does not use secondary world server and will maintain a reference to its own scoreboard. In vanilla, this is not an issue as there is only ever one world. Similarly to maps, an overwrite to the scoreboard reference has been added for when another world has been created. This should also address BUKKIT-3982 and BUKKIT-3985 By: Wesley Wolfe --- .../src/main/java/org/bukkit/craftbukkit/CraftServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 5baed2583..8a079d38a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -721,8 +721,9 @@ public final class CraftServer implements Server { } internal.worldMaps = console.worlds.get(0).worldMaps; + internal.scoreboard = getScoreboardManager().getMainScoreboard().getHandle(); - internal.tracker = new EntityTracker(internal); // CraftBukkit + internal.tracker = new EntityTracker(internal); internal.addIWorldAccess(new WorldManager(console, internal)); internal.difficulty = 1; internal.setSpawnFlags(true, true);