Macro escape key crash fix.

coltonk9043 · Jan 20, 2025 · fef1d89 · fef1d89
1 parent 2e5bff0
commit fef1d89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/net/aoba/managers/macros/MacroRecorder.java b/src/main/java/net/aoba/managers/macros/MacroRecorder.java
@@ -85,8 +85,8 @@ public void addToMacroManager() {
 
 	@Override
 	public void onKeyUp(KeyUpEvent event) {
-		// Don't record the Aoba GUI button.
 		if (event.GetKey() != Aoba.getInstance().guiManager.clickGuiButton.getValue().getCode()
+				&& event.GetKey() != 256
 				&& !Aoba.getInstance().guiManager.isClickGuiOpen()) {
 			long timeStamp = System.nanoTime() - startTime;
 			currentMacro.add(new KeyClickMacroEvent(timeStamp, event.GetKey(), event.GetScanCode(), event.GetAction(),
@@ -96,15 +96,16 @@ public void onKeyUp(KeyUpEvent event) {
 
 	@Override
 	public void onKeyDown(KeyDownEvent event) {
-		// Don't record the Aoba GUI button.
 		if (event.GetKey() != Aoba.getInstance().guiManager.clickGuiButton.getValue().getCode()
+				&& event.GetKey() != 256
 				&& !Aoba.getInstance().guiManager.isClickGuiOpen()) {
 			long timeStamp = System.nanoTime() - startTime;
 			currentMacro.add(new KeyClickMacroEvent(timeStamp, event.GetKey(), event.GetScanCode(), event.GetAction(),
 					event.GetModifiers()));
 		}
 	}
 
+
 	@Override
 	public void onMouseScroll(MouseScrollEvent event) {
 		if (!Aoba.getInstance().guiManager.isClickGuiOpen()) {

diff --git a/src/main/java/net/aoba/managers/macros/actions/MacroEvent.java b/src/main/java/net/aoba/managers/macros/actions/MacroEvent.java
@@ -41,7 +41,7 @@ public void write(DataOutputStream fs) throws IOException {
 	/**
 	 * Reads the data from a DataInputStream
 	 * 
-	 * @param fs DataInputStream to read from.
+	 * @param in DataInputStream to read from.
 	 */
 	public void read(DataInputStream in) throws IOException {
 		timestamp = in.readLong();