Removed fast killaura

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 87c00cab0aead490c0c7e10e48e5e957cf5072c2..4137625ccb4a8b354c0629706a1b2d01c22bb5f0 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2148,7 +2148,7 @@ priv_bypass (Make the Client think it has all privs) bool true
 
 fastdig (Fast Dig) bool false
 
-prevent_natural_damage (Prevent Natural Damage e.g Fall Damage) bool true
+prevent_natural_damage (Prevent Fall Damage) bool true
 
 freecam (Move around freely) bool false
 
@@ -2158,7 +2158,6 @@ no_hurt_cam (No Hurt Cam) bool false
 
 increase_tool_range (Increase Tool Range) bool true
 
-killaura_fast (Enable fast Killaura) bool true
-
 hud_flags_bypass (Enable HUD Flags Bypass) bool true
 
+antiknockback (Anti Knockback) bool false

diff --git a/src/client/game.cpp b/src/client/game.cpp
index 7c224929637421951a6faf62abdc5a0f6dca2a73..adb8709949f982fad6482a88aef9f5ecebe21d52 100644 (file)
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -2363,10 +2363,6 @@ PointedThing Game::updatePointedThing(
        const NodeDefManager *nodedef = map.getNodeDefManager();
 
        if (g_settings->getBool("killaura")) {
-               LocalPlayer *player = env.getLocalPlayer();
-               v3f player_pos = player->getPosition();
-               ItemStack selected_item, hand_item;
-               const ItemStack &tool_item = player->getWieldedItem(&selected_item, &hand_item);
                std::vector<DistanceSortedActiveObject> allObjects;
                env.getActiveObjects(shootline.start, shootline.getLength() + 10.0f, allObjects);
                const v3f line_vector = shootline.getVector();
@@ -2382,12 +2378,7 @@ PointedThing Game::updatePointedThing(
                        aabb3f offsetted_box(selection_box.MinEdge + pos, selection_box.MaxEdge + pos);
                        boxLineCollision(offsetted_box, shootline.start, line_vector, &intersection, &normal);
                        PointedThing pointed(id, intersection, normal, (intersection - shootline.start).getLengthSQ());
-                       if (g_settings->getBool("killaura_fast"))
-                               client->interact(INTERACT_START_DIGGING, pointed);
-                       else {
-                               runData.selected_object = obj;
-                               handlePointingAtObject(pointed, tool_item, player_pos, false);
-                       }
+                       client->interact(INTERACT_START_DIGGING, pointed);
                        break;
                }
        }

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 1dde62ff134a9e84879c6527064f2fc351b0dd7b..2ec23b9d86f21f5fde69a9f190289df81e5691b1 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -74,7 +74,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("killaura", "falses");
        settings->setDefault("no_hurt_cam", "false");
        settings->setDefault("increase_tool_range", "true");
-       settings->setDefault("killaura_fast", "true");
        settings->setDefault("hud_flags_bypass", "true");
        settings->setDefault("antiknockback", "false");