diff options
| author | md_5 <git@md-5.net> | 2017-06-15 20:34:19 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-06-15 20:34:19 +1000 |
| commit | a7d074c6c0842d716387c7516720208c4afe5755 (patch) | |
| tree | 9c0b39e2980ee60bd477acccba005d37528e12a7 /nms-patches/WorldServer.patch | |
| parent | 885da43758f1e15fc5dbe95cfa1f1020a871356f (diff) | |
| download | craftbukkit-a7d074c6c0842d716387c7516720208c4afe5755.tar craftbukkit-a7d074c6c0842d716387c7516720208c4afe5755.tar.gz craftbukkit-a7d074c6c0842d716387c7516720208c4afe5755.tar.lz craftbukkit-a7d074c6c0842d716387c7516720208c4afe5755.tar.xz craftbukkit-a7d074c6c0842d716387c7516720208c4afe5755.zip | |
SPIGOT-3329: Allow per world loot tables
Diffstat (limited to 'nms-patches/WorldServer.patch')
| -rw-r--r-- | nms-patches/WorldServer.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nms-patches/WorldServer.patch b/nms-patches/WorldServer.patch index 844080d5..57a5ae85 100644 --- a/nms-patches/WorldServer.patch +++ b/nms-patches/WorldServer.patch @@ -67,17 +67,16 @@ persistentscoreboard.a(this.scoreboard); ((ScoreboardServer) this.scoreboard).a((Runnable) (new RunnableSaveScoreboard(persistentscoreboard))); -- this.B = new LootTableRegistry(new File(new File(this.dataManager.getDirectory(), "data"), "loot_tables")); -- this.C = new AdvancementDataWorld(new File(new File(this.dataManager.getDirectory(), "data"), "advancements")); -- this.D = new CustomFunctionData(new File(new File(this.dataManager.getDirectory(), "data"), "functions"), this.server); + // CraftBukkit start + } else { + this.scoreboard = getServer().getScoreboardManager().getMainScoreboard().getHandle(); + } ++ // CraftBukkit end + -+ if (this.B == null) { -+ this.B = new LootTableRegistry(new File(new File(this.dataManager.getDirectory(), "data"), "loot_tables")); -+ } + this.B = new LootTableRegistry(new File(new File(this.dataManager.getDirectory(), "data"), "loot_tables")); +- this.C = new AdvancementDataWorld(new File(new File(this.dataManager.getDirectory(), "data"), "advancements")); +- this.D = new CustomFunctionData(new File(new File(this.dataManager.getDirectory(), "data"), "functions"), this.server); ++ // CraftBukkit start + if (this.C == null) { + this.C = new AdvancementDataWorld(new File(new File(this.dataManager.getDirectory(), "data"), "advancements")); + } |