minetest-stuffs/dragonfire-client-waspsaliva
minetest-stuffs/dragonfire-client-waspsaliva
1
0
Fork 0
Code Issues 2 Pull Requests Releases 2 Wiki Activity

Forcefully place items when minetest.place_node is used

Browse Source
This commit is contained in:
Elias Fleckenstein 2021-02-18 20:19:17 +01:00
parent 546ab256b2
commit e391ee435f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/game.cpp
View File

@ -2563,7 +2563,7 @@ void Game::handlePointingAtNode(const PointedThing &pointed,
bool Game::nodePlacement(const ItemDefinition &selected_def, bool Game::nodePlacement(const ItemDefinition &selected_def,
const ItemStack &selected_item, const v3s16 &nodepos, const v3s16 &neighbourpos, 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; std::string prediction = selected_def.node_placement_prediction;
const NodeDefManager *nodedef = client->ndef(); const NodeDefManager *nodedef = client->ndef();
@ -2579,7 +2579,7 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
// formspec in meta // formspec in meta
if (meta && !meta->getString("formspec").empty() && !input->isRandom() if (meta && !meta->getString("formspec").empty() && !input->isRandom()
&& !isKeyDown(KeyType::SNEAK)) { && !isKeyDown(KeyType::SNEAK) && !force) {
// on_rightclick callbacks are called anyway // on_rightclick callbacks are called anyway
if (nodedef_manager->get(map.getNode(nodepos)).rightclickable) if (nodedef_manager->get(map.getNode(nodepos)).rightclickable)
client->interact(INTERACT_PLACE, pointed); client->interact(INTERACT_PLACE, pointed);
@ -2603,7 +2603,7 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
// on_rightclick callback // on_rightclick callback
if (prediction.empty() || (nodedef->get(node).rightclickable && if (prediction.empty() || (nodedef->get(node).rightclickable &&
!isKeyDown(KeyType::SNEAK))) { !isKeyDown(KeyType::SNEAK) && !force)) {
// Report to server // Report to server
client->interact(INTERACT_PLACE, pointed); client->interact(INTERACT_PLACE, pointed);
return false; return false;

2
src/client/game.h
View File

@ -822,7 +822,7 @@ public:
bool nodePlacement(const ItemDefinition &selected_def, const ItemStack &selected_item, bool nodePlacement(const ItemDefinition &selected_def, const ItemStack &selected_item,
const v3s16 &nodepos, const v3s16 &neighbourpos, const PointedThing &pointed, const v3s16 &nodepos, const v3s16 &neighbourpos, const PointedThing &pointed,
const NodeMetadata *meta); const NodeMetadata *meta, bool force = false);
static const ClientEventHandler clientEventHandler[CLIENTEVENT_MAX]; static const ClientEventHandler clientEventHandler[CLIENTEVENT_MAX];
InputHandler *input = nullptr; InputHandler *input = nullptr;

2
src/script/lua_api/l_client.cpp
View File

@ -440,7 +440,7 @@ int ModApiClient::l_place_node(lua_State *L)
pointed.node_abovesurface = pos; pointed.node_abovesurface = pos;
pointed.node_undersurface = pos; pointed.node_undersurface = pos;
NodeMetadata *meta = map.getNodeMetadata(pos); NodeMetadata *meta = map.getNodeMetadata(pos);
g_game->nodePlacement(selected_def, selected_item, pos, pos, pointed, meta); g_game->nodePlacement(selected_def, selected_item, pos, pos, pointed, meta, true);
return 0; return 0;
} }