From 751126c5985888dcdd8dd3de94ec94e971619f8a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 19 Jun 2022 18:39:40 -0700 Subject: [PATCH] Fix pause menu bug --- src/GamePanel.java | 4 ++-- src/MenuPanel.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GamePanel.java b/src/GamePanel.java index 0be5951..b58d0fe 100644 --- a/src/GamePanel.java +++ b/src/GamePanel.java @@ -177,7 +177,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ try { if (isDialogue || isPaused) { mouseAlreadyTranslated = true; - keyPressed(new KeyEvent(new Component() {}, 0, 0, 0, KeyEvent.VK_ENTER, (char)KeyEvent.VK_ENTER)); + keyPressed(new KeyEvent(new Component() {}, 0, -1, 0, KeyEvent.VK_ENTER, (char)KeyEvent.VK_ENTER)); } else { player.mousePressed(e); } @@ -553,7 +553,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ isPaused = !isPaused; System.out.println(isPaused); } else if (e.getKeyCode() == KeyEvent.VK_ENTER) { - if (isPaused && (e.getSource() == null)) { + if (isPaused && (e.getWhen() != -1)) { ((CardLayout)gameFrame.getLayout()).show(gameFrame, "menu"); } else if (!waitForDialogue) { waitForDialogue = true; diff --git a/src/MenuPanel.java b/src/MenuPanel.java index 53b9dc0..4e38826 100644 --- a/src/MenuPanel.java +++ b/src/MenuPanel.java @@ -75,7 +75,7 @@ public class MenuPanel extends JPanel implements Runnable, KeyListener{ public void mousePressed(MouseEvent e) { if (hoverCheck(e)) { keyPressed(new KeyEvent(new Component() { - }, 0, 0, 0, KeyEvent.VK_ENTER, (char)KeyEvent.VK_ENTER)); + }, 0, -1, 0, KeyEvent.VK_ENTER, (char)KeyEvent.VK_ENTER)); } } });