diff --git a/Minecraft.Client/GameRenderer.cpp b/Minecraft.Client/GameRenderer.cpp index 390f114de..2030cfe5b 100644 --- a/Minecraft.Client/GameRenderer.cpp +++ b/Minecraft.Client/GameRenderer.cpp @@ -1169,8 +1169,6 @@ void GameRenderer::render(float a, bool bFirst) lastNsTime = System::nanoTime(); - ApplyGammaPostProcess(); - if (!mc->options->hideGui || mc->screen != NULL) { mc->gui->render(a, mc->screen != NULL, xMouse, yMouse); @@ -1196,6 +1194,7 @@ void GameRenderer::render(float a, bool bFirst) if (mc->screen != NULL && mc->screen->particles != NULL) mc->screen->particles->render(a); } + ApplyGammaPostProcess(); } void GameRenderer::renderLevel(float a) diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index 864820aff..0d827a0bf 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -986,7 +986,6 @@ static Minecraft* InitialiseMinecraftRuntime() ProfileManager.SetDebugFullOverride(true); - // Initialise storage manager — was accidentally left inside #if 0 in original code StorageManager.Init(0, app.GetString(IDS_DEFAULT_SAVENAME), "savegame.dat", FIFTY_ONE_MB, &CConsoleMinecraftApp::DisplaySavingMessage, (LPVOID)&app, ""); StorageManager.StoreTMSPathName(); diff --git a/Minecraft.World/StemTile.cpp b/Minecraft.World/StemTile.cpp index bf9b058d1..62b0d57bb 100644 --- a/Minecraft.World/StemTile.cpp +++ b/Minecraft.World/StemTile.cpp @@ -187,10 +187,10 @@ void StemTile::spawnResources(Level *level, int x, int y, int z, int data, float Item *seed = NULL; if (fruit == Tile::pumpkin) seed = Item::seeds_pumpkin; if (fruit == Tile::melon) seed = Item::seeds_melon; - for (int i = 0; i < 3; i++) - { - popResource(level, x, y, z, shared_ptr(new ItemInstance(seed))); - } + if (seed != NULL) + { + popResource(level, x, y, z, shared_ptr(new ItemInstance(seed))); + } } int StemTile::getResource(int data, Random *random, int playerBonusLevel)