diff options
author | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-11-03 22:06:43 +0100 |
---|---|---|
committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-11-03 22:06:43 +0100 |
commit | 1bc145ff44bee52d3b71812cc06ffe214f4ac216 (patch) | |
tree | 7ea9f3b0029bbf5041c2f05c7d3f3e156c3e6186 /src/Root.cpp | |
parent | Merge pull request #2595 from cengizIO/master (diff) | |
parent | Implemented brewing (diff) | |
download | cuberite-1bc145ff44bee52d3b71812cc06ffe214f4ac216.tar cuberite-1bc145ff44bee52d3b71812cc06ffe214f4ac216.tar.gz cuberite-1bc145ff44bee52d3b71812cc06ffe214f4ac216.tar.bz2 cuberite-1bc145ff44bee52d3b71812cc06ffe214f4ac216.tar.lz cuberite-1bc145ff44bee52d3b71812cc06ffe214f4ac216.tar.xz cuberite-1bc145ff44bee52d3b71812cc06ffe214f4ac216.tar.zst cuberite-1bc145ff44bee52d3b71812cc06ffe214f4ac216.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Root.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Root.cpp b/src/Root.cpp index 57056cc1b..ed9076268 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -5,6 +5,7 @@ #include "Server.h" #include "World.h" #include "WebAdmin.h" +#include "BrewingRecipes.h" #include "FurnaceRecipe.h" #include "CraftingRecipes.h" #include "Bindings/PluginManager.h" @@ -53,6 +54,7 @@ cRoot::cRoot(void) : m_MonsterConfig(nullptr), m_CraftingRecipes(nullptr), m_FurnaceRecipe(nullptr), + m_BrewingRecipes(nullptr), m_WebAdmin(nullptr), m_PluginManager(nullptr), m_MojangAPI(nullptr) @@ -169,6 +171,7 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo) m_RankManager->Initialize(*m_MojangAPI); m_CraftingRecipes = new cCraftingRecipes(); m_FurnaceRecipe = new cFurnaceRecipe(); + m_BrewingRecipes.reset(new cBrewingRecipes()); LOGD("Loading worlds..."); LoadWorlds(*settingsRepo); @@ -913,8 +916,3 @@ int cRoot::GetFurnaceFuelBurnTime(const cItem & a_Fuel) cFurnaceRecipe * FR = Get()->GetFurnaceRecipe(); return FR->GetBurnTime(a_Fuel); } - - - - - |