Fix stare bot instruction not always giving bots the right pitch due …

…to recent changes (Thanks Goodly), try to fix rare issue where NWSE cursor is invalid
ClassiCube · Oct 26, 2023 · a8c096c · a8c096c
1 parent 9d40e99
commit a8c096c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/GUI/Program.cs b/GUI/Program.cs
@@ -106,8 +106,8 @@ public static class Program
                 Cursor c = Cursors.SizeNWSE;
             } catch (ArgumentException ex) {
                 Logger.LogError("checking Cursors", ex);
-                Popup.Warning("Video driver appears to be returning buggy cursor sizes\n\nAttempting to workaround this issue (might not work)");
                 try { BypassCursorsHACK(); } catch { }
+                Popup.Warning("Video driver appears to be returning buggy cursor sizes\n\nAttempted to workaround this issue (might not work)");
             } catch (Exception ex) {
                 Logger.LogError("checking Cursors", ex);
             } 

diff --git a/MCGalaxy/Bots/Instructions/HunterInstructions.cs b/MCGalaxy/Bots/Instructions/HunterInstructions.cs
@@ -159,9 +159,9 @@ public sealed class StareInstruction : BotInstruction {
 
         static void FaceTowards(PlayerBot bot, Player p) {
             Position srcPos = bot.Pos;
-            srcPos.Y += ModelInfo.CalcEyeHeight(p);            
+            srcPos.Y += ModelInfo.CalcEyeHeight(bot);
             Position dstPos = p.Pos;
-            dstPos.Y += ModelInfo.CalcEyeHeight(bot);
+            dstPos.Y += ModelInfo.CalcEyeHeight(p);
 
             bot.FaceTowards(srcPos, dstPos);
         }