diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-03-10 09:38:46 +0100 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-03-10 09:38:46 +0100 |
| commit | 1309066be8bc9e7cd688b8f84f8cfa761bea9ebe (patch) | |
| tree | d02114be6438fab3e68513d941ca5af101acf34c /src/client | |
| parent | bc79c2344e226bdf833382b5ce51c47ddd536bf2 (diff) | |
| parent | 16696823242ca3b82d932542899e77894238fa2c (diff) | |
| download | dragonfireclient-1309066be8bc9e7cd688b8f84f8cfa761bea9ebe.tar.xz | |
Merge branch 'master' of https://github.com/EliasFleckenstein03/dragonfireclient
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/game.cpp | 6 | ||||
| -rw-r--r-- | src/client/game.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client/game.cpp b/src/client/game.cpp index 10c3a7ceb..4862d3ed9 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -2563,7 +2563,7 @@ void Game::handlePointingAtNode(const PointedThing &pointed, bool Game::nodePlacement(const ItemDefinition &selected_def, const ItemStack &selected_item, const v3s16 &nodepos, const v3s16 &neighbourpos, - const PointedThing &pointed, const NodeMetadata *meta) + const PointedThing &pointed, const NodeMetadata *meta, bool force) { std::string prediction = selected_def.node_placement_prediction; const NodeDefManager *nodedef = client->ndef(); @@ -2579,7 +2579,7 @@ bool Game::nodePlacement(const ItemDefinition &selected_def, // formspec in meta if (meta && !meta->getString("formspec").empty() && !input->isRandom() - && !isKeyDown(KeyType::SNEAK)) { + && !isKeyDown(KeyType::SNEAK) && !force) { // on_rightclick callbacks are called anyway if (nodedef_manager->get(map.getNode(nodepos)).rightclickable) client->interact(INTERACT_PLACE, pointed); @@ -2603,7 +2603,7 @@ bool Game::nodePlacement(const ItemDefinition &selected_def, // on_rightclick callback if (prediction.empty() || (nodedef->get(node).rightclickable && - !isKeyDown(KeyType::SNEAK))) { + !isKeyDown(KeyType::SNEAK) && !force)) { // Report to server client->interact(INTERACT_PLACE, pointed); return false; diff --git a/src/client/game.h b/src/client/game.h index af0b7ef54..50a734be6 100644 --- a/src/client/game.h +++ b/src/client/game.h @@ -822,7 +822,7 @@ public: bool nodePlacement(const ItemDefinition &selected_def, const ItemStack &selected_item, const v3s16 &nodepos, const v3s16 &neighbourpos, const PointedThing &pointed, - const NodeMetadata *meta); + const NodeMetadata *meta, bool force = false); static const ClientEventHandler clientEventHandler[CLIENTEVENT_MAX]; InputHandler *input = nullptr; |