diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index 00ec8e0a..c2ca666d 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -58,6 +58,8 @@ void AssetsLoader::addDefaults(AssetsLoader& loader, bool world) { loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/gui/menubg.png", "gui/menubg"); loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/gui/delete_icon.png", "gui/delete_icon"); loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/gui/no_icon.png", "gui/no_icon"); + loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/gui/warning.png", "gui/warning"); + loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/gui/error.png", "gui/error"); if (world) { loader.add(ASSET_SHADER, SHADERS_FOLDER"/ui3d", "ui3d"); loader.add(ASSET_SHADER, SHADERS_FOLDER"/background", "background"); diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 14d6d06c..482b5b01 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -306,7 +306,7 @@ void PlayerController::updateInteraction(){ if (def->grounded && !chunks->isSolidBlock(x, y-1, z)) { chosenBlock = 0; } - if (chosenBlock != vox->id) { + if (chosenBlock != vox->id && chosenBlock) { chunks->set(x, y, z, chosenBlock, states); lighting->onBlockSet(x,y,z, chosenBlock); if (def->rt.funcsset.onplaced) {