From 20f6375153cbad91d2d111a4baa9f10ae39b2c17 Mon Sep 17 00:00:00 2001
From: ORelio <oreliogitantispam.l0gin@spamgourmet.com>
Date: Sat, 14 Nov 2020 10:19:51 +0100
Subject: [PATCH] Merge #1332 and #1333

Add optional arguments to DigBlock()
---
 MinecraftClient/ChatBot.cs  | 8 +++++---
 MinecraftClient/McClient.cs | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/MinecraftClient/ChatBot.cs b/MinecraftClient/ChatBot.cs
index b9996933..7b333d70 100644
--- a/MinecraftClient/ChatBot.cs
+++ b/MinecraftClient/ChatBot.cs
@@ -860,10 +860,12 @@ namespace MinecraftClient
         /// <summary>
         /// Attempt to dig a block at the specified location
         /// </summary>
-        /// <param name="location">Location</param>
-        protected bool DigBlock(Location location)
+        /// <param name="location">Location of block to dig</param>
+        /// <param name="swingArms">Also perform the "arm swing" animation</param>
+        /// <param name="lookAtBlock">Also look at the block before digging</param>
+        protected bool DigBlock(Location location, bool swingArms = true, bool lookAtBlock = true)
         {
-            return Handler.DigBlock(location);
+            return Handler.DigBlock(location, swingArms, lookAtBlock);
         }
 
         /// <summary>
diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs
index 6883db9d..b631cb96 100644
--- a/MinecraftClient/McClient.cs
+++ b/MinecraftClient/McClient.cs
@@ -1402,7 +1402,8 @@ namespace MinecraftClient
         /// </summary>
         /// <param name="location">Location of block to dig</param>
         /// <param name="swingArms">Also perform the "arm swing" animation</param>
-        public bool DigBlock(Location location, bool swingArms = true)
+        /// <param name="lookAtBlock">Also look at the block before digging</param>
+        public bool DigBlock(Location location, bool swingArms = true, bool lookAtBlock = true)
         {
             if (GetTerrainEnabled())
             {
@@ -1410,7 +1411,8 @@ namespace MinecraftClient
                 Direction blockFace = Direction.Down;
 
                 // Look at block before attempting to break it
-                UpdateLocation(GetCurrentLocation(), location);
+                if (lookAtBlock)
+                    UpdateLocation(GetCurrentLocation(), location);
 
                 // Send dig start and dig end, will need to wait for server response to know dig result
                 // See https://wiki.vg/How_to_Write_a_Client#Digging for more details